From: Andrew Morton <akpm@osdl.org>
Date: Wed, 20 Dec 2006 18:03:11 +0000 (-0500)
Subject: [libata] pata_cs5530: suspend/resume support tweak
X-Git-Tag: v2.6.20-rc2~80^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0153260a1e4379e70d224a7bfdf2b5c5c9b43e94;p=linux-2.6-omap-h63xx.git

[libata] pata_cs5530: suspend/resume support tweak

side-effectful-expression-within-assert give me the creeps.

Cc: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 1c628014dae..b1ca207e354 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -372,7 +372,8 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 static int cs5530_reinit_one(struct pci_dev *pdev)
 {
 	/* If we fail on resume we are doomed */
-	BUG_ON(cs5530_init_chip());
+	if (cs5530_init_chip())
+		BUG();
 	return ata_pci_device_resume(pdev);
 }