Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

[firefly-linux-kernel-4.4.55.git] / block / bsg.c

diff --git a/block/bsg.c b/block/bsg.c
index 7154a7a7e9ca6240c30ccf4cf5d5213edd3d0c18..0676301f16d0a619bd76261ebb5560040ce1a4e9 100644 (file)
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -424,7 +424,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 = rq->errors & 0xff;
+       hdr->device_status = status_byte(rq->errors);
        hdr->transport_status = host_byte(rq->errors);
        hdr->driver_status = driver_byte(rq->errors);
        hdr->info = 0;