diff options
Diffstat (limited to 'drivers/net/usb/kaweth.c')
-rw-r--r-- | drivers/net/usb/kaweth.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index 2b7b39cad1ce..ad0298f9b5f9 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c | |||
@@ -406,6 +406,7 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth, | |||
406 | 406 | ||
407 | if (fw->size > KAWETH_FIRMWARE_BUF_SIZE) { | 407 | if (fw->size > KAWETH_FIRMWARE_BUF_SIZE) { |
408 | err("Firmware too big: %zu", fw->size); | 408 | err("Firmware too big: %zu", fw->size); |
409 | release_firmware(fw); | ||
409 | return -ENOSPC; | 410 | return -ENOSPC; |
410 | } | 411 | } |
411 | data_len = fw->size; | 412 | data_len = fw->size; |
@@ -759,14 +760,6 @@ static int kaweth_close(struct net_device *net) | |||
759 | return 0; | 760 | return 0; |
760 | } | 761 | } |
761 | 762 | ||
762 | static void kaweth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | ||
763 | { | ||
764 | struct kaweth_device *kaweth = netdev_priv(dev); | ||
765 | |||
766 | strlcpy(info->driver, driver_name, sizeof(info->driver)); | ||
767 | usb_make_path(kaweth->dev, info->bus_info, sizeof (info->bus_info)); | ||
768 | } | ||
769 | |||
770 | static u32 kaweth_get_link(struct net_device *dev) | 763 | static u32 kaweth_get_link(struct net_device *dev) |
771 | { | 764 | { |
772 | struct kaweth_device *kaweth = netdev_priv(dev); | 765 | struct kaweth_device *kaweth = netdev_priv(dev); |
@@ -775,7 +768,6 @@ static u32 kaweth_get_link(struct net_device *dev) | |||
775 | } | 768 | } |
776 | 769 | ||
777 | static const struct ethtool_ops ops = { | 770 | static const struct ethtool_ops ops = { |
778 | .get_drvinfo = kaweth_get_drvinfo, | ||
779 | .get_link = kaweth_get_link | 771 | .get_link = kaweth_get_link |
780 | }; | 772 | }; |
781 | 773 | ||
@@ -1229,7 +1221,7 @@ static void kaweth_disconnect(struct usb_interface *intf) | |||
1229 | 1221 | ||
1230 | usb_set_intfdata(intf, NULL); | 1222 | usb_set_intfdata(intf, NULL); |
1231 | if (!kaweth) { | 1223 | if (!kaweth) { |
1232 | dev_warn(&intf->dev, "unregistering non-existant device\n"); | 1224 | dev_warn(&intf->dev, "unregistering non-existent device\n"); |
1233 | return; | 1225 | return; |
1234 | } | 1226 | } |
1235 | netdev = kaweth->net; | 1227 | netdev = kaweth->net; |