aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/smsc911x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/smsc911x.c')
-rw-r--r--drivers/net/smsc911x.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index b60639bd181b..94b6d2658ddc 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -1779,6 +1779,7 @@ static const struct net_device_ops smsc911x_netdev_ops = {
1779 .ndo_get_stats = smsc911x_get_stats, 1779 .ndo_get_stats = smsc911x_get_stats,
1780 .ndo_set_multicast_list = smsc911x_set_multicast_list, 1780 .ndo_set_multicast_list = smsc911x_set_multicast_list,
1781 .ndo_do_ioctl = smsc911x_do_ioctl, 1781 .ndo_do_ioctl = smsc911x_do_ioctl,
1782 .ndo_change_mtu = eth_change_mtu,
1782 .ndo_validate_addr = eth_validate_addr, 1783 .ndo_validate_addr = eth_validate_addr,
1783 .ndo_set_mac_address = smsc911x_set_mac_address, 1784 .ndo_set_mac_address = smsc911x_set_mac_address,
1784#ifdef CONFIG_NET_POLL_CONTROLLER 1785#ifdef CONFIG_NET_POLL_CONTROLLER
@@ -1938,7 +1939,7 @@ static int __devexit smsc911x_drv_remove(struct platform_device *pdev)
1938 if (!res) 1939 if (!res)
1939 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1940 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1940 1941
1941 release_mem_region(res->start, res->end - res->start); 1942 release_mem_region(res->start, resource_size(res));
1942 1943
1943 iounmap(pdata->ioaddr); 1944 iounmap(pdata->ioaddr);
1944 1945
@@ -1976,7 +1977,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
1976 retval = -ENODEV; 1977 retval = -ENODEV;
1977 goto out_0; 1978 goto out_0;
1978 } 1979 }
1979 res_size = res->end - res->start + 1; 1980 res_size = resource_size(res);
1980 1981
1981 irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); 1982 irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
1982 if (!irq_res) { 1983 if (!irq_res) {
@@ -2104,7 +2105,7 @@ out_unmap_io_3:
2104out_free_netdev_2: 2105out_free_netdev_2:
2105 free_netdev(dev); 2106 free_netdev(dev);
2106out_release_io_1: 2107out_release_io_1:
2107 release_mem_region(res->start, res->end - res->start); 2108 release_mem_region(res->start, resource_size(res));
2108out_0: 2109out_0:
2109 return retval; 2110 return retval;
2110} 2111}