diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-12-20 19:03:11 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-20 19:03:11 +0100 |
| commit | 0153260a1e4379e70d224a7bfdf2b5c5c9b43e94 (patch) | |
| tree | 3048859301a74c469ed0bf7523924ce3931d3a1c /drivers/ata/pata_cs5530.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
| download | linux-0153260a1e4379e70d224a7bfdf2b5c5c9b43e94.tar.xz linux-0153260a1e4379e70d224a7bfdf2b5c5c9b43e94.zip | |
[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/ata/pata_cs5530.c')
| -rw-r--r-- | drivers/ata/pata_cs5530.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c index 1c628014dae6..b1ca207e3545 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); } |