diff --git a/[refs] b/[refs]
index 18a8d5c99b17..62fea7dbfdb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7b1a35ea563a8f1219dc3fdf12f37937cb83245
+refs/heads/master: 6bd522f6a226f435508433d24e0de4619e016a9d
diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c
index a20730c48020..6d62be664d55 100644
--- a/trunk/drivers/scsi/scsi_lib.c
+++ b/trunk/drivers/scsi/scsi_lib.c
@@ -1533,7 +1533,7 @@ static void scsi_request_fn(struct request_queue *q)
 		 * we add the dev to the starved list so it eventually gets
 		 * a run when a tag is freed.
 		 */
-		if (blk_queue_tagged(q) && (req->tag == -1)) {
+		if (blk_queue_tagged(q) && !blk_rq_tagged(req)) {
 			if (list_empty(&sdev->starved_entry))
 				list_add_tail(&sdev->starved_entry,
 					      &shost->starved_list);