Merge branch 'linux-2.6'

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index db22d1ff4e..bef781fec5 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -970,7 +970,8 @@ static void ide_check_pm_state(ide_drive_t *drive, struct request *rq)
                 if (rc)
                         printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive->name);
                 SELECT_DRIVE(drive);
-                HWIF(drive)->OUTB(8, HWIF(drive)->io_ports[IDE_CONTROL_OFFSET]);
+                if (IDE_CONTROL_REG)
+                        HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);
                 rc = ide_wait_not_busy(HWIF(drive), 100000);
                 if (rc)
                         printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name);