From 1d455dc401f940e75bc77706c8ba29e89337c596 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew@wil.cx>
Date: Wed, 15 Dec 2010 15:44:02 -0500
Subject: [PATCH] --- yaml --- r: 227027 b: refs/heads/master c:
 4400ef311e10666a2e5acf97d040df89cb880cb2 h: refs/heads/master i:   227025:
 f1eeedf9ede62a9f9b5339388f006f03e237302a   227023:
 d75203538646dfb8f72491529290dbfe43c0e5bd v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/usb/storage/uas.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5ac8e835165d..ed80ecc1ddf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cdc5bd8b2b1190cb54548c03194b154b4892e2a
+refs/heads/master: 4400ef311e10666a2e5acf97d040df89cb880cb2
diff --git a/trunk/drivers/usb/storage/uas.c b/trunk/drivers/usb/storage/uas.c
index 2054b1e25a65..3c7a24433784 100644
--- a/trunk/drivers/usb/storage/uas.c
+++ b/trunk/drivers/usb/storage/uas.c
@@ -49,14 +49,17 @@ struct command_iu {
 	__u8 cdb[16];	/* XXX: Overflow-checking tools may misunderstand */
 };
 
+/*
+ * Also used for the Read Ready and Write Ready IUs since they have the
+ * same first four bytes
+ */
 struct sense_iu {
 	__u8 iu_id;
 	__u8 rsvd1;
 	__be16 tag;
 	__be16 status_qual;
 	__u8 status;
-	__u8 service_response;
-	__u8 rsvd8[6];
+	__u8 rsvd7[7];
 	__be16 len;
 	__u8 sense[SCSI_SENSE_BUFFERSIZE];
 };