]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[libata] pata_cs5530: suspend/resume support tweak
authorAndrew Morton <akpm@osdl.org>
Wed, 20 Dec 2006 18:03:11 +0000 (13:03 -0500)
committerJeff Garzik <jeff@garzik.org>
Wed, 20 Dec 2006 18:03:11 +0000 (13:03 -0500)
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>
drivers/ata/pata_cs5530.c

index 1c628014dae612512062fda499f3bca4f6c71c6e..b1ca207e3545dcdce0b828806ded54db5a39891e 100644 (file)
@@ -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);
 }