diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@trik.(none)> | 2005-04-02 20:09:12 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@trik.(none)> | 2005-04-02 20:09:12 +0200 |
| commit | a04780b2d7f0c71486a6c3e4b452ff8b05f2bd59 (patch) | |
| tree | 4a1dd2ec08fcdef2d0f5142d1e9600b5ce7e49df | |
| parent | 3a644abc595a21d9e23caf3b4219386e06fd0b7c (diff) | |
| download | history-a04780b2d7f0c71486a6c3e4b452ff8b05f2bd59.tar.gz | |
[ide] fix via82cxxx resume failure
With David Woodhouse <dwmw2@infradead.org>.
On resume from sleep, via_set_speed() doesn't reinstate the correct
mode, because it thinks the drive is already configured correctly.
Also kill redundant printk, ide_config_drive_speed() warns about errors.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| -rw-r--r-- | drivers/ide/pci/via82cxxx.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index d90f4d2251ab0f..069dbffe211667 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c @@ -332,11 +332,8 @@ static int via_set_drive(ide_drive_t *drive, u8 speed) struct ide_timing t, p; unsigned int T, UT; - if (speed != XFER_PIO_SLOW && speed != drive->current_speed) - if (ide_config_drive_speed(drive, speed)) - printk(KERN_WARNING "ide%d: Drive %d didn't " - "accept speed setting. Oh, well.\n", - drive->dn >> 1, drive->dn & 1); + if (speed != XFER_PIO_SLOW) + ide_config_drive_speed(drive, speed); T = 1000000000 / via_clock; |