aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/serial_cs.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-01-24 12:20:22 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2010-02-17 12:00:18 -0500
commita78621bb11fbad32a3ef968c65f9b93858b3341a (patch)
treec6b5d58f69185fb3562aeaac2664b00c1c128b20 /drivers/serial/serial_cs.c
parent7ab24855482fbc47712de46c05726d59cd0748e2 (diff)
pcmcia: handle error in serial_cs config calls
Do not ignore the error returned by simple_config() / multi_config(). CC: linux-serial@vger.kernel.org Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/serial/serial_cs.c')
-rw-r--r--drivers/serial/serial_cs.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 0ee7239c5d69..8d38eabda826 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -695,11 +695,11 @@ static int serial_config(struct pcmcia_device * link)
695 info->multi = info->quirk->multi; 695 info->multi = info->quirk->multi;
696 696
697 if (info->multi > 1) 697 if (info->multi > 1)
698 multi_config(link); 698 i = multi_config(link);
699 else 699 else
700 simple_config(link); 700 i = simple_config(link);
701 701
702 if (info->ndev == 0) 702 if (i || info->ndev == 0)
703 goto failed; 703 goto failed;
704 704
705 /* 705 /*
@@ -714,6 +714,7 @@ static int serial_config(struct pcmcia_device * link)
714 return 0; 714 return 0;
715 715
716failed: 716failed:
717 dev_warn(&link->dev, "serial_cs: failed to initialize\n");
717 serial_remove(link); 718 serial_remove(link);
718 return -ENODEV; 719 return -ENODEV;
719} 720}