diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-01-18 19:51:49 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-01-18 19:51:49 +0100 |
| commit | c23010ffb20acb02a1d41dc025131609916ed633 (patch) | |
| tree | 8a6ce10eb17196a3e22cccf92daa9e36d2651eab /block/blk-mq.c | |
| parent | 532a208ad61018b586cebfca8431291fe9c10ce7 (diff) | |
| parent | 7505c06dabb5e814bda610c8d83338544f15db45 (diff) | |
Merge tag 'asoc-fix-v5.11-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.11
A few more fixes for v5.11, mostly around HDA jack detection, plus
a couple of updates to the MAINTAINERS entries.
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index c338c9bc5a2c..f285a9123a8b 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -294,8 +294,8 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data, rq->mq_hctx = data->hctx; rq->rq_flags = 0; rq->cmd_flags = data->cmd_flags; - if (data->flags & BLK_MQ_REQ_PREEMPT) - rq->rq_flags |= RQF_PREEMPT; + if (data->flags & BLK_MQ_REQ_PM) + rq->rq_flags |= RQF_PM; if (blk_queue_io_stat(data->q)) rq->rq_flags |= RQF_IO_STAT; INIT_LIST_HEAD(&rq->queuelist); |