From: Andrew Morton <akpm@osdl.org>

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

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

 drivers/ata/pata_cs5530.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/ata/pata_cs5530.c~pata_cs5530-suspend-resume-support-tweak drivers/ata/pata_cs5530.c
--- a/drivers/ata/pata_cs5530.c~pata_cs5530-suspend-resume-support-tweak
+++ a/drivers/ata/pata_cs5530.c
@@ -372,7 +372,8 @@ static int cs5530_init_one(struct pci_de
 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);
 }
 
_