diff options
author | Alex Elder <aelder@sgi.com> | 2010-10-21 08:29:34 -0500 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-10-21 08:29:34 -0500 |
commit | 39dc948c6921169e13224a97fa53188922acfde8 (patch) | |
tree | ef9c310031ebc21321d9f10ca6afea90d37a2f57 /block | |
parent | a731cd116c9334e01bcf3e676c0c621fe7de6ce4 (diff) | |
parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) |
Merge branch 'v2.6.36'
Diffstat (limited to 'block')
-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; |