summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-10-01 17:14:07 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-10-01 17:14:07 +0100
commitfe59d5372ae719ca4550958f1e5bb4dd6eeac9cd (patch)
tree08ac6bf26961f7bfba6c371f566333c030dd5d77 /drivers/serial
parentbcf5111a58c7db968c3fb9cd77e340a5e076f549 (diff)
downloadop-kernel-dev-fe59d5372ae719ca4550958f1e5bb4dd6eeac9cd.zip
op-kernel-dev-fe59d5372ae719ca4550958f1e5bb4dd6eeac9cd.tar.gz
[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.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 1267cbe..00f9ffd 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;
}
OpenPOWER on IntegriCloud