These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / ide / ide-eh.c

diff --git a/kernel/drivers/ide/ide-eh.c b/kernel/drivers/ide/ide-eh.c
index 3297066..d6da011 100644 (file)
--- a/kernel/drivers/ide/ide-eh.c
+++ b/kernel/drivers/ide/ide-eh.c
@@ -129,7 +129,7 @@ ide_startstop_t ide_error(ide_drive_t *drive, const char *msg, u8 stat)
 
                        if (cmd)
                                ide_complete_cmd(drive, cmd, stat, err);
-               } else if (blk_pm_request(rq)) {
+               } else if (ata_pm_request(rq)) {
                        rq->errors = 1;
                        ide_complete_pm_rq(drive, rq);
                        return ide_stopped;
@@ -147,7 +147,7 @@ static inline void ide_complete_drive_reset(ide_drive_t *drive, int err)
 {
        struct request *rq = drive->hwif->rq;
 
-       if (rq && rq->cmd_type == REQ_TYPE_SPECIAL &&
+       if (rq && rq->cmd_type == REQ_TYPE_DRV_PRIV &&
            rq->cmd[0] == REQ_DRIVE_RESET) {
                if (err <= 0 && rq->errors == 0)
                        rq->errors = -EIO;