summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2010-10-21 14:52:03 -0700
committerColin Cross <ccross@android.com>2010-10-21 14:52:03 -0700
commit677151f967dc7ced6840d420f69e15ed6ed3e553 (patch)
treea3b8e227e83909e5105920aade6adc79fdc63680 /block
parentea63bded335543aa6855a9f2d2da836c4853a569 (diff)
parent766197150ffa2e0fc34e852203372f0903ddd9ed (diff)
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'block')
-rw-r--r--block/bsg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bsg.c b/block/bsg.c
index 82d58829ba59..0c00870553a3 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -426,7 +426,7 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,
/*
* fill in all the output members
*/
- hdr->device_status = status_byte(rq->errors);
+ hdr->device_status = rq->errors & 0xff;
hdr->transport_status = host_byte(rq->errors);
hdr->driver_status = driver_byte(rq->errors);
hdr->info = 0;