aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2014-01-21 17:39:23 -0500
committerJens Axboe <axboe@kernel.dk>2014-01-21 23:16:56 -0500
commit4336548af4a2e73b4d786266e520e4e595718665 (patch)
tree544e2cbab24447473aef5a244246ef95be6a16a0
parent3f7d758b1e3c18360f955d1d5e224865c5e0b881 (diff)
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:
5004 5004
5005 i = alloc_cciss_hba(pdev); 5005 i = alloc_cciss_hba(pdev);
5006 if (i < 0) 5006 if (i < 0)
5007 return -1; 5007 return -ENOMEM;
5008 5008
5009 h = hba[i]; 5009 h = hba[i];
5010 h->pdev = pdev; 5010 h->pdev = pdev;
@@ -5205,7 +5205,7 @@ clean_no_release_regions:
5205 */ 5205 */
5206 pci_set_drvdata(pdev, NULL); 5206 pci_set_drvdata(pdev, NULL);
5207 free_hba(h); 5207 free_hba(h);
5208 return -1; 5208 return -ENODEV;
5209} 5209}
5210 5210
5211static void cciss_shutdown(struct pci_dev *pdev) 5211static void cciss_shutdown(struct pci_dev *pdev)