diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-11 16:45:41 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-11 16:45:43 +1100 |
| commit | 2bcae7925413156780f0bc00b3a3b20a0e09c948 (patch) | |
| tree | 71c6f9d388e95490096c2e24fb7b5331cc947912 /drivers/block/cciss.c | |
| parent | 80d50b9fca54d3014895f492f2cf291251d41f6d (diff) | |
| parent | 7c5598d4c8740214860372b6e6114f2675d68429 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/mm/init.c
fs/anon_inodes.c
fs/autofs4/inode.c
include/linux/lglock.h
kernel/Makefile
scripts/bloat-o-meter
Diffstat (limited to 'drivers/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 0c004ac05811..6b0db4438618 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) |