diff options
author | Colin Cross <ccross@android.com> | 2010-10-21 14:48:14 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2010-10-21 14:48:14 -0700 |
commit | 766197150ffa2e0fc34e852203372f0903ddd9ed (patch) | |
tree | 837dad8eddfec6f15e725c5d497dae25dd450593 /block/bsg.c | |
parent | 61804f1c4993adc1df1f2ebd4425b1249b7e531a (diff) | |
parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) |
Merge commit 'v2.6.36' into linux-tegra-2.6.36
Diffstat (limited to 'block/bsg.c')
-rw-r--r-- | block/bsg.c | 2 |
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; |