On Thu, 2013-02-14 at 11:36 -0500, Ewan D. Milne wrote: > From: "Ewan D. Milne" <emilne@xxxxxxxxxx> > > init_sd() was returning 0 if sd_cdb_cache or sd_cdb_pool could > not be allocated. Return -ENOMEM instead, since the sd_disk_class > and the blkdevs will be unregistered if this happens. > > Signed-off-by: Ewan D. Milne <emilne@xxxxxxxxxx> > --- > drivers/scsi/sd.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c > index 8551f3e..4943a4f 100644 > --- a/drivers/scsi/sd.c > +++ b/drivers/scsi/sd.c > @@ -2931,12 +2931,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; > } > Would someone mind looking at this patch and ACKing it if you feel it is appropriate? Thanks. -Ewan D. Milne <emilne@xxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html