From def2e061b789037dd941167dd3bd09b8256ce449 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 1 Oct 2006 17:14:07 +0100 Subject: [PATCH] --- yaml --- r: 38219 b: refs/heads/master c: fe59d5372ae719ca4550958f1e5bb4dd6eeac9cd h: refs/heads/master i: 38217: ef2b2d22506873e72ce932d3c75f7903e5dbdae6 38215: 0d76d88601b04f9e90a14e8c2a6c7b021189c8cd v: v3 --- [refs] | 2 +- trunk/drivers/serial/serial_cs.c | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 8c241c9a23be..d47e8a62f288 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcf5111a58c7db968c3fb9cd77e340a5e076f549 +refs/heads/master: fe59d5372ae719ca4550958f1e5bb4dd6eeac9cd diff --git a/trunk/drivers/serial/serial_cs.c b/trunk/drivers/serial/serial_cs.c index 1267cbed52f5..00f9ffd69489 100644 --- a/trunk/drivers/serial/serial_cs.c +++ b/trunk/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; }