diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-20 16:13:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-20 16:13:09 -0400 |
| commit | 30c278192f9ab06125fb042f6e46763e0fd7140a (patch) | |
| tree | eb457072fec9bed01d89a71ab61257785a24a66a /block | |
| parent | ef2533dae5a93527f2aac9449c0b1564c5ed2c2f (diff) | |
| parent | 478971600e47cb83ff2d3c63c5c24f2b04b0d6a1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] bsg: fix incorrect device_status value
[SCSI] Fix VPD inquiry page wrapper
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, | |||
| 426 | /* | 426 | /* |
| 427 | * fill in all the output members | 427 | * fill in all the output members |
| 428 | */ | 428 | */ |
| 429 | hdr->device_status = status_byte(rq->errors); | 429 | hdr->device_status = rq->errors & 0xff; |
| 430 | hdr->transport_status = host_byte(rq->errors); | 430 | hdr->transport_status = host_byte(rq->errors); |
| 431 | hdr->driver_status = driver_byte(rq->errors); | 431 | hdr->driver_status = driver_byte(rq->errors); |
| 432 | hdr->info = 0; | 432 | hdr->info = 0; |