summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2014-01-21 14:39:23 -0800
committerJens Axboe <axboe@kernel.dk>2014-01-21 20:16:56 -0800
commit4336548af4a2e73b4d786266e520e4e595718665 (patch)
tree544e2cbab24447473aef5a244246ef95be6a16a0
parent3f7d758b1e3c18360f955d1d5e224865c5e0b881 (diff)
downloadlinux-stable-4336548af4a2e73b4d786266e520e4e595718665.tar.gz
linux-stable-4336548af4a2e73b4d786266e520e4e595718665.tar.bz2
linux-stable-4336548af4a2e73b4d786266e520e4e595718665.zip
drivers/block/cciss.c:cciss_init_one(): use proper errnos
pci_driver.probe should return a meaningful errno, not -1. Cc: Jens Axboe <axboe@kernel.dk> Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--drivers/block/cciss.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index b35fc4f5237c..036e8ab86c71 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -5004,7 +5004,7 @@ reinit_after_soft_reset:
i = alloc_cciss_hba(pdev);
if (i < 0)
- return -1;
+ return -ENOMEM;
h = hba[i];
h->pdev = pdev;
@@ -5205,7 +5205,7 @@ clean_no_release_regions:
*/
pci_set_drvdata(pdev, NULL);
free_hba(h);
- return -1;
+ return -ENODEV;
}
static void cciss_shutdown(struct pci_dev *pdev)