diff options
| author | Oliver Neukum <oneukum@suse.com> | 2016-08-17 16:51:56 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-19 09:25:33 +0300 |
| commit | 575ced7f8090c1a4e91e2daf8da9352a6a1fc7a7 (patch) | |
| tree | 8a5e52dfb0a2b5f3c3f58e093a58d950783eb140 /drivers/net/usb | |
| parent | 60bcabd080f53561efa9288be45c128feda1a8bb (diff) | |
| download | linux-575ced7f8090c1a4e91e2daf8da9352a6a1fc7a7.tar.xz | |
kaweth: fix oops upon failed memory allocation
Just return an error upon failure.
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/kaweth.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index 37bf715ab53b..528b9c9c4e60 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -1009,6 +1009,7 @@ static int kaweth_probe( struct net_device *netdev; const eth_addr_t bcast_addr = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; int result = 0; + int rv = -EIO; dev_dbg(dev, "Kawasaki Device Probe (Device number:%d): 0x%4.4x:0x%4.4x:0x%4.4x\n", @@ -1049,6 +1050,10 @@ static int kaweth_probe( /* Download the firmware */ dev_info(dev, "Downloading firmware...\n"); kaweth->firmware_buf = (__u8 *)__get_free_page(GFP_KERNEL); + if (!kaweth->firmware_buf) { + rv = -ENOMEM; + goto err_free_netdev; + } if ((result = kaweth_download_firmware(kaweth, "kaweth/new_code.bin", 100, @@ -1203,7 +1208,7 @@ err_only_tx: err_free_netdev: free_netdev(netdev); - return -EIO; + return rv; } /**************************************************************** |