sd: bad return code of init_sd

In init_sd function, if kmem_cache_create or mempool_create_slab_pools
calls fail, the error will not be correclty reported because
class_register previously set the value of err to 0.

Signed-off-by: Clément Calmels <[email protected]>
Reviewed-by: Ewan D. Milne <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 4056004102ae4a274e6e16ceffaee5be2ae2348d..5167b96782409d63599057175bc497b7ae82da90 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3212,12 +3212,14 @@ static int __init init_sd(void)
                                         0, 0, NULL);
        if (!sd_cdb_cache) {
                printk(KERN_ERR "sd: can't init extended cdb cache\n");
+               err = -ENOMEM;
                goto err_out_class;
        }
 
        sd_cdb_pool = mempool_create_slab_pool(SD_MEMPOOL_SIZE, sd_cdb_cache);
        if (!sd_cdb_pool) {
                printk(KERN_ERR "sd: can't init extended cdb pool\n");
+               err = -ENOMEM;
                goto err_out_cache;
        }