aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-10-01 12:14:07 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-10-01 12:14:07 -0400
commitfe59d5372ae719ca4550958f1e5bb4dd6eeac9cd (patch)
tree08ac6bf26961f7bfba6c371f566333c030dd5d77 /drivers/serial
parentbcf5111a58c7db968c3fb9cd77e340a5e076f549 (diff)
[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 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)
307 307
308static int serial_resume(struct pcmcia_device *link) 308static int serial_resume(struct pcmcia_device *link)
309{ 309{
310 if (pcmcia_dev_present(link)) { 310 struct serial_info *info = link->priv;
311 struct serial_info *info = link->priv; 311 int i;
312 int i;
313 312
314 for (i = 0; i < info->ndev; i++) 313 for (i = 0; i < info->ndev; i++)
315 serial8250_resume_port(info->line[i]); 314 serial8250_resume_port(info->line[i]);
316 315
317 if (info->quirk && info->quirk->wakeup) 316 if (info->quirk && info->quirk->wakeup)
318 info->quirk->wakeup(link); 317 info->quirk->wakeup(link);
319 }
320 318
321 return 0; 319 return 0;
322} 320}