From 8fe3c5f6bf2fce24bf06ef91d1f57fd3df1bf501 Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Sun, 24 Jan 2010 18:20:22 +0100 Subject: [PATCH] --- yaml --- r: 182007 b: refs/heads/master c: a78621bb11fbad32a3ef968c65f9b93858b3341a h: refs/heads/master i: 182005: f8b4920f4607bbea781caccfe1464355f1b3d94b 182003: a10590fcf1e855ce88fbb7cfbe43347899793d21 181999: 6c01e3adcbaf1a9dbb32341cd78fcd907e144d5f v: v3 --- [refs] | 2 +- trunk/drivers/serial/serial_cs.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7a2ef87d74d5..9b26c3ef82c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ab24855482fbc47712de46c05726d59cd0748e2 +refs/heads/master: a78621bb11fbad32a3ef968c65f9b93858b3341a diff --git a/trunk/drivers/serial/serial_cs.c b/trunk/drivers/serial/serial_cs.c index 0ee7239c5d69..8d38eabda826 100644 --- a/trunk/drivers/serial/serial_cs.c +++ b/trunk/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; }