aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-12-20 13:03:11 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-20 13:03:11 -0500
commit0153260a1e4379e70d224a7bfdf2b5c5c9b43e94 (patch)
tree3048859301a74c469ed0bf7523924ce3931d3a1c /drivers
parentf238085415c56618e042252894f2fcc971add645 (diff)
downloadkernel_samsung_espresso10-0153260a1e4379e70d224a7bfdf2b5c5c9b43e94.zip
kernel_samsung_espresso10-0153260a1e4379e70d224a7bfdf2b5c5c9b43e94.tar.gz
kernel_samsung_espresso10-0153260a1e4379e70d224a7bfdf2b5c5c9b43e94.tar.bz2
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/pata_cs5530.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 1c62801..b1ca207 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);
}