Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / drivers / net / can / sja1000 / peak_pcmcia.c

diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
index ec6bd9d1b2af93edd67c4c8083e5c90648bbc581..272a85f32b14c86b040bf854b0df541e463a4af7 100644 (file)
--- a/drivers/net/can/sja1000/peak_pcmcia.c
+++ b/drivers/net/can/sja1000/peak_pcmcia.c
@@ -686,8 +686,10 @@ static int __devinit pcan_probe(struct pcmcia_device *pdev)
 
        /* detect available channels */
        pcan_add_channels(card);
-       if (!card->chan_count)
+       if (!card->chan_count) {
+               err = -ENOMEM;
                goto probe_err_4;
+       }
 
        /* init the timer which controls the leds */
        init_timer(&card->led_timer);