diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-12-01 12:02:23 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-12-01 12:02:23 +0800 |
commit | a5e9874fc9e05e8471bfd58cabd75a3432d38ba6 (patch) | |
tree | ff0a388af912d9a20635ea8bae6f82e660dcf427 /drivers/scsi/scsi_scan.c | |
parent | 0a2aefa1f71da3bb10634918c68f6fb0068c1052 (diff) | |
parent | 8576fa45c10e665bb72931a31461c7310f3c5494 (diff) |
Merge tag 'v4.1.36' into linux-linaro-lsk-v4.1lsk-v4.1-16.12
This is the 4.1.36 stable release
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
-rw-r--r-- | drivers/scsi/scsi_scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 6efab1c455e1..f7aa434811b5 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -1516,12 +1516,12 @@ retry: out_err: kfree(lun_data); out: - scsi_device_put(sdev); if (scsi_device_created(sdev)) /* * the sdev we used didn't appear in the report luns scan */ __scsi_remove_device(sdev); + scsi_device_put(sdev); return ret; } |