diff options
Diffstat (limited to 'drivers/firewire/net.c')
| -rw-r--r-- | drivers/firewire/net.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index 6b895986dc2..c3986452194 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -929,8 +929,6 @@ static void fwnet_write_complete(struct fw_card *card, int rcode,  	if (rcode == RCODE_COMPLETE) {  		fwnet_transmit_packet_done(ptask);  	} else { -		fwnet_transmit_packet_failed(ptask); -  		if (printk_timed_ratelimit(&j,  1000) || rcode != last_rcode) {  			dev_err(&ptask->dev->netdev->dev,  				"fwnet_write_complete failed: %x (skipped %d)\n", @@ -938,8 +936,10 @@ static void fwnet_write_complete(struct fw_card *card, int rcode,  			errors_skipped = 0;  			last_rcode = rcode; -		} else +		} else {  			errors_skipped++; +		} +		fwnet_transmit_packet_failed(ptask);  	}  } @@ -1462,8 +1462,8 @@ static int fwnet_probe(struct fw_unit *unit,  	net = alloc_netdev(sizeof(*dev), "firewire%d", fwnet_init_dev);  	if (net == NULL) { -		ret = -ENOMEM; -		goto out; +		mutex_unlock(&fwnet_device_mutex); +		return -ENOMEM;  	}  	allocated_netdev = true;  | 
