diff --git a/[refs] b/[refs]
index 93fcc6793b89..a1dac14c8378 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16d3ea26f82271fef9b1c4523b5e1ea31fa39eec
+refs/heads/master: 478971600e47cb83ff2d3c63c5c24f2b04b0d6a1
diff --git a/trunk/block/bsg.c b/trunk/block/bsg.c
index 82d58829ba59..0c00870553a3 100644
--- a/trunk/block/bsg.c
+++ b/trunk/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;