diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-10-01 18:14:07 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-10-01 18:14:07 +0200 |
| commit | fe59d5372ae719ca4550958f1e5bb4dd6eeac9cd (patch) | |
| tree | 08ac6bf26961f7bfba6c371f566333c030dd5d77 /drivers/serial | |
| parent | [SERIAL] Remove wrong asm/serial.h inclusions (diff) | |
| download | linux-fe59d5372ae719ca4550958f1e5bb4dd6eeac9cd.tar.xz linux-fe59d5372ae719ca4550958f1e5bb4dd6eeac9cd.zip | |
[SERIAL] Fix resume handling bug
Unfortunately, pcmcia_dev_present() returns false when a device is
suspended, so checking this on resume does not work too well. Omit
this test.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_cs.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index 1267cbed52f5..00f9ffd69489 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c @@ -307,16 +307,14 @@ static int serial_suspend(struct pcmcia_device *link) static int serial_resume(struct pcmcia_device *link) { - if (pcmcia_dev_present(link)) { - struct serial_info *info = link->priv; - int i; + struct serial_info *info = link->priv; + int i; - for (i = 0; i < info->ndev; i++) - serial8250_resume_port(info->line[i]); + for (i = 0; i < info->ndev; i++) + serial8250_resume_port(info->line[i]); - if (info->quirk && info->quirk->wakeup) - info->quirk->wakeup(link); - } + if (info->quirk && info->quirk->wakeup) + info->quirk->wakeup(link); return 0; } |