Commit aaf0885c authored by Marek Belisko's avatar Marek Belisko Committed by Greg Kroah-Hartman

staging: ft1000: Use specific error return code for reg_ft1000_netdev().

Signed-off-by: default avatarMarek Belisko <marek.belisko@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 78890fdb
...@@ -1103,7 +1103,7 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev) ...@@ -1103,7 +1103,7 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
// Notes: // Notes:
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
u16 reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *intf) int reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *intf)
{ {
struct net_device *netdev; struct net_device *netdev;
FT1000_INFO *pInfo; FT1000_INFO *pInfo;
...@@ -1124,7 +1124,7 @@ u16 reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *int ...@@ -1124,7 +1124,7 @@ u16 reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *int
{ {
DEBUG("reg_ft1000_netdev: could not register network device\n"); DEBUG("reg_ft1000_netdev: could not register network device\n");
free_netdev(netdev); free_netdev(netdev);
return STATUS_FAILURE; return rc;
} }
...@@ -1149,7 +1149,7 @@ u16 reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *int ...@@ -1149,7 +1149,7 @@ u16 reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *int
pInfo->CardReady = 1; pInfo->CardReady = 1;
return STATUS_SUCCESS; return 0;
} }
static int ft1000_reset(struct net_device *dev) static int ft1000_reset(struct net_device *dev)
......
...@@ -191,7 +191,9 @@ static int ft1000_probe(struct usb_interface *interface, ...@@ -191,7 +191,9 @@ static int ft1000_probe(struct usb_interface *interface,
DEBUG("ft1000_probe::Card Ready!!!! Registering network device\n"); DEBUG("ft1000_probe::Card Ready!!!! Registering network device\n");
reg_ft1000_netdev(ft1000dev, interface); ret = reg_ft1000_netdev(ft1000dev, interface);
if (ret)
goto err_load;
pft1000info->NetDevRegDone = 1; pft1000info->NetDevRegDone = 1;
......
...@@ -597,7 +597,7 @@ char *getfw (char *fn, size_t *pimgsz); ...@@ -597,7 +597,7 @@ char *getfw (char *fn, size_t *pimgsz);
int dsp_reload(struct ft1000_device *ft1000dev); int dsp_reload(struct ft1000_device *ft1000dev);
u16 init_ft1000_netdev(struct ft1000_device *ft1000dev); u16 init_ft1000_netdev(struct ft1000_device *ft1000dev);
struct usb_interface; struct usb_interface;
u16 reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *intf); int reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *intf);
int ft1000_poll(void* dev_id); int ft1000_poll(void* dev_id);
void ft1000InitProc(struct net_device *dev); void ft1000InitProc(struct net_device *dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment