Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

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

diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index b70f0fca9a42e724e3911d62cd64729a2f20ce4b..e7472f567c9de7bb640bf1cc5b56e51b7cf88471 100644 (file)
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -619,8 +619,10 @@ static int carm_array_info (struct carm_host *host, unsigned int array_idx)
               host->state == HST_DEV_SCAN);
        spin_unlock_irq(&host->lock);
 
-       DPRINTK("blk_insert_request, tag == %u\n", idx);
-       blk_insert_request(host->oob_q, crq->rq, 1, crq);
+       DPRINTK("blk_execute_rq_nowait, tag == %u\n", idx);
+       crq->rq->cmd_type = REQ_TYPE_SPECIAL;
+       crq->rq->special = crq;
+       blk_execute_rq_nowait(host->oob_q, NULL, crq->rq, true, NULL);
 
        return 0;
 
@@ -658,8 +660,10 @@ static int carm_send_special (struct carm_host *host, carm_sspc_t func)
        BUG_ON(rc < 0);
        crq->msg_bucket = (u32) rc;
 
-       DPRINTK("blk_insert_request, tag == %u\n", idx);
-       blk_insert_request(host->oob_q, crq->rq, 1, crq);
+       DPRINTK("blk_execute_rq_nowait, tag == %u\n", idx);
+       crq->rq->cmd_type = REQ_TYPE_SPECIAL;
+       crq->rq->special = crq;
+       blk_execute_rq_nowait(host->oob_q, NULL, crq->rq, true, NULL);
 
        return 0;
 }