diff options
author | Mark Brown <broonie@kernel.org> | 2015-08-21 15:26:37 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-21 15:26:37 -0700 |
commit | d033de5ceee8333e4fee3d59a956244d3736102a (patch) | |
tree | 5bdebcac18ed67890571632570c324e0c41a7223 /drivers/scsi/st.c | |
parent | 1a8e7fab70c8d7cad2e606e7b21d46e42e51c2fd (diff) | |
parent | f7644cbfcdf03528f0f450f3940c4985b2291f49 (diff) | |
download | linux-d033de5ceee8333e4fee3d59a956244d3736102a.tar.gz linux-d033de5ceee8333e4fee3d59a956244d3736102a.tar.bz2 linux-d033de5ceee8333e4fee3d59a956244d3736102a.zip |
Merge tag 'v4.2-rc6' into asoc-topology
Linux 4.2-rc6
Diffstat (limited to 'drivers/scsi/st.c')
-rw-r--r-- | drivers/scsi/st.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 3f25b8fa921d..871f3553987d 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -1329,9 +1329,9 @@ static int st_open(struct inode *inode, struct file *filp) spin_lock(&st_use_lock); STp->in_use = 0; spin_unlock(&st_use_lock); - scsi_tape_put(STp); if (resumed) scsi_autopm_put_device(STp->device); + scsi_tape_put(STp); return retval; } |