From 913d83a1676f9da83187a481c72fcf22d4a0ea0c Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 1 Feb 2008 23:09:32 +0100
Subject: [PATCH] --- yaml --- r: 82144 b: refs/heads/master c:
 ed908fa1d037d780ebd04a412693bf3fc9c3a8fe h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/ide/ppc/pmac.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 86856f689ba2..f1038fb44b61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed1f78899195545ec49bc9a42ee8eb35697b216a
+refs/heads/master: ed908fa1d037d780ebd04a412693bf3fc9c3a8fe
diff --git a/trunk/drivers/ide/ppc/pmac.c b/trunk/drivers/ide/ppc/pmac.c
index b17e097650b1..f6a374a0de03 100644
--- a/trunk/drivers/ide/ppc/pmac.c
+++ b/trunk/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;