Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0153260a1e4379e70d224a7bfdf2b5c5c9b43e94 Commit: 0153260a1e4379e70d224a7bfdf2b5c5c9b43e94 Parent: f238085415c56618e042252894f2fcc971add645 Author: Andrew Morton <[EMAIL PROTECTED]> AuthorDate: Wed Dec 20 13:03:11 2006 -0500 Committer: Jeff Garzik <[EMAIL PROTECTED]> CommitDate: Wed Dec 20 13:03:11 2006 -0500
[libata] pata_cs5530: suspend/resume support tweak side-effectful-expression-within-assert give me the creeps. Cc: Alan Cox <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]> --- 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 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); } - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html