Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujits...

[firefly-linux-kernel-4.4.55.git] / drivers / ide / ide-park.c

diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c
index f41558a0bcd1742a75503a52028399e093d46403..ca958604cda21217f6d6a1bce6240fbf07fb2d7f 100644 (file)
--- a/drivers/ide/ide-park.c
+++ b/drivers/ide/ide-park.c
@@ -46,7 +46,7 @@ static void issue_park_cmd(ide_drive_t *drive, unsigned long timeout)
         * timeout has expired, so power management will be reenabled.
         */
        rq = blk_get_request(q, READ, GFP_NOWAIT);
-       if (unlikely(!rq))
+       if (IS_ERR(rq))
                goto out;
 
        rq->cmd[0] = REQ_UNPARK_HEADS;