[PATCH 22/22] pcmcia: handle error in serial_cs config calls
Dominik Brodowski
linux at dominikbrodowski.net
Sun Jan 24 12:32:48 EST 2010
Do not ignore the error returned by simple_config() / multi_config().
Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>
---
drivers/serial/serial_cs.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 0ee7239..8d38eab 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)
info->multi = info->quirk->multi;
if (info->multi > 1)
- multi_config(link);
+ i = multi_config(link);
else
- simple_config(link);
+ i = simple_config(link);
- if (info->ndev == 0)
+ if (i || info->ndev == 0)
goto failed;
/*
@@ -714,6 +714,7 @@ static int serial_config(struct pcmcia_device * link)
return 0;
failed:
+ dev_warn(&link->dev, "serial_cs: failed to initialize\n");
serial_remove(link);
return -ENODEV;
}
--
1.6.3.3
More information about the linux-pcmcia
mailing list