summaryrefslogtreecommitdiffstats
path: root/drivers/net/can/sja1000/peak_pcmcia.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/can/sja1000/peak_pcmcia.c')
-rw-r--r--drivers/net/can/sja1000/peak_pcmcia.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
index dd56133cc461..4b8758e10bd4 100644
--- a/drivers/net/can/sja1000/peak_pcmcia.c
+++ b/drivers/net/can/sja1000/peak_pcmcia.c
@@ -692,9 +692,7 @@ static int pcan_probe(struct pcmcia_device *pdev)
}
/* init the timer which controls the leds */
- init_timer(&card->led_timer);
- card->led_timer.function = pcan_led_timer;
- card->led_timer.data = (unsigned long)card;
+ setup_timer(&card->led_timer, pcan_led_timer, (unsigned long)card);
/* request the given irq */
err = request_irq(pdev->irq, &pcan_isr, IRQF_SHARED, PCC_NAME, card);
OpenPOWER on IntegriCloud