diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-04-17 22:37:20 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-05-05 13:40:42 -0600 |
| commit | a7928c1578c550bd6f4dec62d65132e6db226c57 (patch) | |
| tree | 1a9a13abf0679e7dc4e1e5124cd4fcb3c0ac1265 /drivers/ide/ide-eh.c | |
| parent | ac7cdff00a33d48d27217560fa3b16d802e5f535 (diff) | |
| download | talos-obmc-linux-a7928c1578c550bd6f4dec62d65132e6db226c57.tar.gz talos-obmc-linux-a7928c1578c550bd6f4dec62d65132e6db226c57.zip | |
block: move PM request support to IDE
This removes the request types and hacks from the block code and into the
old IDE driver. There is a small amunt of code duplication due to this,
but it's not too bad.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/ide/ide-eh.c')
| -rw-r--r-- | drivers/ide/ide-eh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-eh.c b/drivers/ide/ide-eh.c index 19d809c48a8d..d6da011299f5 100644 --- a/drivers/ide/ide-eh.c +++ b/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; |
