diff options
author | 2006-12-13 15:44:27 +0100 | |
---|---|---|
committer | 2006-12-13 15:44:27 +0100 | |
commit | 2fc2c60df3d2b3a557eb8d750779def9d51934b1 (patch) | |
tree | c01576800f24494986704aa1e69c7d661de9f679 /drivers/block | |
parent | [PATCH] Allow as-iosched to be unloaded (diff) | |
download | linux-2fc2c60df3d2b3a557eb8d750779def9d51934b1.tar.gz linux-2fc2c60df3d2b3a557eb8d750779def9d51934b1.tar.bz2 linux-2fc2c60df3d2b3a557eb8d750779def9d51934b1.zip |
[PATCH] Fixup cciss error handling
The previous cciss commit removed the err_out_disable_pdev label, but
there was still a user of that. Fix that up.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/cciss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 335e218b6dcc..2ee4a44423df 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -2837,7 +2837,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) if (err) { printk(KERN_ERR "cciss: Cannot obtain PCI resources, " "aborting\n"); - goto err_out_disable_pdev; + return err; } subsystem_vendor_id = pdev->subsystem_vendor; |