diff --git a/[refs] b/[refs] index 3f67a86b1a0d..9c5261502f7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 210ba1d1724f5c4ed87a2ab1a21ca861a915f734 +refs/heads/master: 166a72878f76e911f2d1ce4b2310d4403e94be11 diff --git a/trunk/drivers/scsi/scsi.c b/trunk/drivers/scsi/scsi.c index ebc019380835..54ff611b8677 100644 --- a/trunk/drivers/scsi/scsi.c +++ b/trunk/drivers/scsi/scsi.c @@ -319,17 +319,16 @@ int scsi_setup_command_freelist(struct Scsi_Host *shost) GFP_KERNEL | shost->cmd_pool->gfp_mask); if (!cmd) goto fail2; - list_add(&cmd->list, &shost->free_list); + list_add(&cmd->list, &shost->free_list); return 0; fail2: + mutex_lock(&host_cmd_pool_mutex); if (!--pool->users) kmem_cache_destroy(pool->slab); - return -ENOMEM; fail: mutex_unlock(&host_cmd_pool_mutex); return -ENOMEM; - } /**