From 310bf393a694c8b2eadf8a51eef53120b676a40a Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 15 Jul 2008 21:21:42 +0200 Subject: [PATCH] --- yaml --- r: 101195 b: refs/heads/master c: c6866a6ff571eebebda45bf14b5b62188768893a h: refs/heads/master i: 101193: 067624f82b63d1f55ecd0c5ebf6579b58571466c 101191: 4d113efbfe0f98e46019e664324d63595337e712 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-io.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cb6d77304f8a..931d6d8bf6e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8a96aa71355edef9f40ce01459acf25c50cb78c +refs/heads/master: c6866a6ff571eebebda45bf14b5b62188768893a diff --git a/trunk/drivers/ide/ide-io.c b/trunk/drivers/ide/ide-io.c index 5aed79ed4586..1eb3f5cce556 100644 --- a/trunk/drivers/ide/ide-io.c +++ b/trunk/drivers/ide/ide-io.c @@ -1606,8 +1606,11 @@ int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t actio spin_lock_irqsave(&ide_lock, flags); if (action == ide_preempt) hwgroup->rq = NULL; - __elv_add_request(drive->queue, rq, where, 0); - ide_do_request(hwgroup, IDE_NO_IRQ); + __elv_add_request(drive->queue, rq, where, 1); + __generic_unplug_device(drive->queue); + /* the queue is stopped so it won't be plugged+unplugged */ + if (blk_pm_resume_request(rq)) + do_ide_request(drive->queue); spin_unlock_irqrestore(&ide_lock, flags); err = 0;