]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[SCSI] bsg: fix incorrect device_status value
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Thu, 16 Sep 2010 15:46:42 +0000 (00:46 +0900)
committerJames Bottomley <James.Bottomley@suse.de>
Fri, 15 Oct 2010 14:18:48 +0000 (10:18 -0400)
bsg incorrectly returns sg's masked_status value for device_status.

[jejb: fix up expression logic]
Reported-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Stable Tree <stable@kernel.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
block/bsg.c

index 82d58829ba591eeef13a3ed4eca96b8a019c4d85..0c00870553a3fca2c58c325b780b92689fc677a6 100644 (file)
@@ -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;