Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 159460
b: refs/heads/master
c: c9145a2
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and David S. Miller committed Aug 13, 2009
1 parent 531b242 commit f65f365
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bdf50d7346588b22fd66367ae2890e2cbf574172
refs/heads/master: c9145a2df072f75d97592ddac1624baeb7bad195
6 changes: 3 additions & 3 deletions trunk/drivers/net/jazzsonic.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ static int __devinit sonic_probe1(struct net_device *dev)

return 0;
out:
release_region(dev->base_addr, SONIC_MEM_SIZE);
release_mem_region(dev->base_addr, SONIC_MEM_SIZE);
return err;
}

Expand Down Expand Up @@ -247,7 +247,7 @@ static int __devinit jazz_sonic_probe(struct platform_device *pdev)
return 0;

out1:
release_region(dev->base_addr, SONIC_MEM_SIZE);
release_mem_region(dev->base_addr, SONIC_MEM_SIZE);
out:
free_netdev(dev);

Expand All @@ -269,7 +269,7 @@ static int __devexit jazz_sonic_device_remove (struct platform_device *pdev)
unregister_netdev(dev);
dma_free_coherent(lp->device, SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
lp->descriptors, lp->descriptors_laddr);
release_region (dev->base_addr, SONIC_MEM_SIZE);
release_mem_region(dev->base_addr, SONIC_MEM_SIZE);
free_netdev(dev);

return 0;
Expand Down

0 comments on commit f65f365

Please sign in to comment.