Merge branch 'pm-cpufreq'

[karo-tx-linux.git] / block / bsg.c

diff --git a/block/bsg.c b/block/bsg.c
index e5214c1480962e5d53c0f0ced44af571051d9654..ff46addde5d8e0877d390901bb6a91bac591bb13 100644 (file)
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -196,7 +196,6 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
         * fill in request structure
         */
        rq->cmd_len = hdr->request_len;
-       rq->cmd_type = REQ_TYPE_BLOCK_PC;
 
        rq->timeout = msecs_to_jiffies(hdr->timeout);
        if (!rq->timeout)
@@ -273,6 +272,8 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,
        rq = blk_get_request(q, rw, GFP_KERNEL);
        if (!rq)
                return ERR_PTR(-ENOMEM);
+       blk_rq_set_block_pc(rq);
+
        ret = blk_fill_sgv4_hdr_rq(q, rq, hdr, bd, has_write_perm);
        if (ret)
                goto out;