Merge tag '4.4-scsi-mkp' into misc

SCSI queue for 4.4.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 9d7b7db75e4b..503ab8b46c0b 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -787,8 +787,14 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,
                 return k;       /* probably out of space --> ENOMEM */
         }
         if (atomic_read(&sdp->detaching)) {
-                if (srp->bio)
+                if (srp->bio) {
+                        if (srp->rq->cmd != srp->rq->__cmd)
+                                kfree(srp->rq->cmd);
+
                         blk_end_request_all(srp->rq, -EIO);
+                        srp->rq = NULL;
+                }
+
                 sg_finish_rem_req(srp);
                 return -ENODEV;
         }