Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebf46a5a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "block: allow REQ_PM requests even when the device is suspended"

parents a401a47c 8cd640e8

block/blk-core.c

+1 −2
Original line number Diff line number Diff line
@@ -2140,8 +2140,7 @@ static void blk_account_io_done(struct request *req) 
static struct request *blk_pm_peek_request(struct request_queue *q,

					   struct request *rq)

{

	if (q->dev && (q->rpm_status == RPM_SUSPENDED ||

	    (q->rpm_status != RPM_ACTIVE && !(rq->cmd_flags & REQ_PM))))

	if (q->dev && q->rpm_status != RPM_ACTIVE && !(rq->cmd_flags & REQ_PM))

		return NULL;

	else

		return rq;