mxc: vpu: remove leftover iounmap() after conversion to devm_ioremap_resource()

[karo-tx-linux.git] / drivers / block / pktcdvd.c

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index ef166ad2dbadc37bdd58a4e055409898291eea82..758ac442c5b5dd0e8c1d2e2689ac1a0d8c06604d 100644 (file)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -704,6 +704,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *
 
        rq = blk_get_request(q, (cgc->data_direction == CGC_DATA_WRITE) ?
                             WRITE : READ, __GFP_WAIT);
+       blk_rq_set_block_pc(rq);
 
        if (cgc->buflen) {
                ret = blk_rq_map_kern(q, rq, cgc->buffer, cgc->buflen,
@@ -716,7 +717,6 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *
        memcpy(rq->cmd, cgc->cmd, CDROM_PACKET_SIZE);
 
        rq->timeout = 60*HZ;
-       rq->cmd_type = REQ_TYPE_BLOCK_PC;
        if (cgc->quiet)
                rq->cmd_flags |= REQ_QUIET;