commit e440b1425d11460f0cd630e276860123fe9256bd
author Badhri Jagan Sridharan <badhri@google.com> Fri May 11 00:32:34 2018 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> Fri May 11 00:32:34 2018 +0000
tree 56a4059a2bcbfe63e5a8b78f748885258a4bf568
parent 6c43be24699d6c24fd5bab817332b7063a5530f4
parent ce1bcff6ed3a64733c4c43848142787ddc5b6485

Merge "UPSTREAM: scsi: sg: don't return bogus Sg_requests" into android-chromeos-dragon-3.18

drivers/scsi/sg.c

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 5e59bde..0f274ec 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -2056,11 +2056,12 @@
 		if ((1 == resp->done) && (!resp->sg_io_owned) &&
 		    ((-1 == pack_id) || (resp->header.pack_id == pack_id))) {
 			resp->done = 2;	/* guard against other readers */
-			break;
+			write_unlock_irqrestore(&sfp->rq_list_lock, iflags);
+			return resp;
 		}
 	}
 	write_unlock_irqrestore(&sfp->rq_list_lock, iflags);
-	return resp;
+	return NULL;
 }
 
 /* always adds to end of list */