diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 23:09:32 +0100 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 23:09:32 +0100 |
commit | ed908fa1d037d780ebd04a412693bf3fc9c3a8fe (patch) | |
tree | 9789ce734b93e67accd5e1665b9c799433ed81e6 | |
parent | ed1f78899195545ec49bc9a42ee8eb35697b216a (diff) | |
download | linux-3.10-ed908fa1d037d780ebd04a412693bf3fc9c3a8fe.tar.gz linux-3.10-ed908fa1d037d780ebd04a412693bf3fc9c3a8fe.tar.bz2 linux-3.10-ed908fa1d037d780ebd04a412693bf3fc9c3a8fe.zip |
ide-pmac: macio resource freeing bugfix
Release DMA resource before zeroing pmif.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r-- | drivers/ide/ppc/pmac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index b17e097650b..f6a374a0de0 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c @@ -1228,12 +1228,12 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) /* The inteface is released to the common IDE layer */ dev_set_drvdata(&mdev->ofdev.dev, NULL); iounmap(base); - if (pmif->dma_regs) + if (pmif->dma_regs) { iounmap(pmif->dma_regs); + macio_release_resource(mdev, 1); + } memset(pmif, 0, sizeof(*pmif)); macio_release_resource(mdev, 0); - if (pmif->dma_regs) - macio_release_resource(mdev, 1); } return rc; |