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>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index b17e097650b1..f6a374a0de03 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;