X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fserial%2Fserial_cs.c;h=2c70773543e052b94f98931557e967c9eb13a9eb;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=06a246ae52c0eb2a016ce7ca1db2978fb2642f0c;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 06a246ae5..2c7077354 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -185,12 +185,14 @@ static int serial_suspend(struct pcmcia_device *link)
 
 static int serial_resume(struct pcmcia_device *link)
 {
-	struct serial_info *info = link->priv;
-	int i;
+	if (pcmcia_dev_present(link)) {
+		struct serial_info *info = link->priv;
+		int i;
 
-	for (i = 0; i < info->ndev; i++)
-		serial8250_resume_port(info->line[i]);
-	wakeup_card(info);
+		for (i = 0; i < info->ndev; i++)
+			serial8250_resume_port(info->line[i]);
+		wakeup_card(info);
+	}
 
 	return 0;
 }
@@ -784,7 +786,6 @@ static struct pcmcia_device_id serial_ids[] = {
 	PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"),
 	PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"),
 	PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "RS-COM-2P.cis"),
-	PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "GLOBETROTTER.cis"),
 	/* too generic */
 	/* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */
 	/* PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0160, 0x0002), */