devices/e100-2.6.20-ethercat.c
changeset 1316 d01d9cce8b59
parent 1311 bf7c62bc533f
child 1317 09173a2de40c
equal deleted inserted replaced
1315:26b4f94cfdfb 1316:d01d9cce8b59
  2191 		goto err_clean_cbs;
  2191 		goto err_clean_cbs;
  2192 	e100_set_multicast_list(nic->netdev);
  2192 	e100_set_multicast_list(nic->netdev);
  2193 	e100_start_receiver(nic, NULL);
  2193 	e100_start_receiver(nic, NULL);
  2194     if (!nic->ecdev) {
  2194     if (!nic->ecdev) {
  2195 		mod_timer(&nic->watchdog, jiffies);
  2195 		mod_timer(&nic->watchdog, jiffies);
  2196         if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
  2196 	}
  2197                         nic->netdev->name, nic->netdev)))
  2197 	if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
  2198             goto err_no_irq;
  2198 					nic->netdev->name, nic->netdev)))
       
  2199 		goto err_no_irq;
       
  2200 	if (!nic->ecdev) {
  2199         netif_wake_queue(nic->netdev);
  2201         netif_wake_queue(nic->netdev);
  2200         netif_poll_enable(nic->netdev);
  2202         netif_poll_enable(nic->netdev);
  2201         /* enable ints _after_ enabling poll, preventing a race between
  2203         /* enable ints _after_ enabling poll, preventing a race between
  2202          * disable ints+schedule */
  2204          * disable ints+schedule */
  2203         e100_enable_irq(nic);
  2205         e100_enable_irq(nic);