From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dominik Brodowski Subject: [PATCH 45/49] pcmcia: handle error in serial_cs config calls Date: Sat, 27 Feb 2010 11:42:40 +0100 Message-ID: <1267267364-5424-45-git-send-email-linux@dominikbrodowski.net> References: <20100227103934.GA4430@comet.dominikbrodowski.net> Return-path: Received: from isilmar.linta.de ([213.133.102.198]:56232 "EHLO linta.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750962Ab0B0KoU (ORCPT ); Sat, 27 Feb 2010 05:44:20 -0500 In-Reply-To: <20100227103934.GA4430@comet.dominikbrodowski.net> Sender: linux-serial-owner@vger.kernel.org List-Id: linux-serial@vger.kernel.org To: linux-pcmcia@lists.infradead.org Cc: Dominik Brodowski , linux-serial@vger.kernel.org Do not ignore the error returned by simple_config() / multi_config(). CC: linux-serial@vger.kernel.org Signed-off-by: Dominik Brodowski --- 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