Quellcode durchsuchen

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>
Dominik Brodowski vor 15 Jahren
Ursprung
Commit
a78621bb11
1 geänderte Dateien mit 4 neuen und 3 gelöschten Zeilen
  1. 4 3
      drivers/serial/serial_cs.c

+ 4 - 3
drivers/serial/serial_cs.c

@@ -695,11 +695,11 @@ static int serial_config(struct pcmcia_device * link)
 		info->multi = info->quirk->multi;
 		info->multi = info->quirk->multi;
 
 
 	if (info->multi > 1)
 	if (info->multi > 1)
-		multi_config(link);
+		i = multi_config(link);
 	else
 	else
-		simple_config(link);
+		i = simple_config(link);
 
 
-	if (info->ndev == 0)
+	if (i || info->ndev == 0)
 		goto failed;
 		goto failed;
 
 
 	/*
 	/*
@@ -714,6 +714,7 @@ static int serial_config(struct pcmcia_device * link)
 	return 0;
 	return 0;
 
 
 failed:
 failed:
+	dev_warn(&link->dev, "serial_cs: failed to initialize\n");
 	serial_remove(link);
 	serial_remove(link);
 	return -ENODEV;
 	return -ENODEV;
 }
 }