diff options
Diffstat (limited to 'drivers/serial/serial_cs.c')
-rw-r--r-- | 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 95421fa3b304..e91db4b38012 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c | |||
@@ -696,11 +696,11 @@ static int serial_config(struct pcmcia_device * link) | |||
696 | info->multi = info->quirk->multi; | 696 | info->multi = info->quirk->multi; |
697 | 697 | ||
698 | if (info->multi > 1) | 698 | if (info->multi > 1) |
699 | multi_config(link); | 699 | i = multi_config(link); |
700 | else | 700 | else |
701 | simple_config(link); | 701 | i = simple_config(link); |
702 | 702 | ||
703 | if (info->ndev == 0) | 703 | if (i || info->ndev == 0) |
704 | goto failed; | 704 | goto failed; |
705 | 705 | ||
706 | /* | 706 | /* |
@@ -715,6 +715,7 @@ static int serial_config(struct pcmcia_device * link) | |||
715 | return 0; | 715 | return 0; |
716 | 716 | ||
717 | failed: | 717 | failed: |
718 | dev_warn(&link->dev, "serial_cs: failed to initialize\n"); | ||
718 | serial_remove(link); | 719 | serial_remove(link); |
719 | return -ENODEV; | 720 | return -ENODEV; |
720 | } | 721 | } |