summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/net/wan/cosa.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/net/wan/cosa.c')
-rw-r--r--kernel/drivers/net/wan/cosa.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/drivers/net/wan/cosa.c b/kernel/drivers/net/wan/cosa.c
index bcfa01add..848ea6a39 100644
--- a/kernel/drivers/net/wan/cosa.c
+++ b/kernel/drivers/net/wan/cosa.c
@@ -517,7 +517,7 @@ static int cosa_probe(int base, int irq, int dma)
*/
set_current_state(TASK_INTERRUPTIBLE);
cosa_putstatus(cosa, SR_TX_INT_ENA);
- schedule_timeout(30);
+ schedule_timeout(msecs_to_jiffies(300));
irq = probe_irq_off(irqs);
/* Disable all IRQs from the card */
cosa_putstatus(cosa, 0);
@@ -589,7 +589,8 @@ static int cosa_probe(int base, int irq, int dma)
chan->netdev->base_addr = chan->cosa->datareg;
chan->netdev->irq = chan->cosa->irq;
chan->netdev->dma = chan->cosa->dma;
- if (register_hdlc_device(chan->netdev)) {
+ err = register_hdlc_device(chan->netdev);
+ if (err) {
netdev_warn(chan->netdev,
"register_hdlc_device() failed\n");
free_netdev(chan->netdev);