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

Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 1f91f2242ce4a30565089466ada63bb2701bcfad..46ce17cf19dae49b70e4ecd48ef8fa983f7c33e1 100644 (file)
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -1103,7 +1103,7 @@ err_net:
 // 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;
     FT1000_INFO *pInfo;
@@ -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");
         free_netdev(netdev);
-        return STATUS_FAILURE;
+       return rc;
     }
 
 
@@ -1149,7 +1149,7 @@ u16 reg_ft1000_netdev(struct ft1000_device *ft1000dev, struct usb_interface *int
     pInfo->CardReady = 1;
 
 
-   return STATUS_SUCCESS;
+       return 0;
 }
 
 static int ft1000_reset(struct net_device *dev)

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
index a2c415e1b8f7268120f55a76067a3401b1096ad0..5fae9547247d23e661a567a587e4676f5abb190d 100644 (file)
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
@@ -191,7 +191,9 @@ static int ft1000_probe(struct usb_interface *interface,
 
        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;
 

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 4368b49f66a3580f9b44a780362dbe649027cb87..2bc27f50144120f106a24f63bcb83d5fe2c8e273 100644 (file)
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -597,7 +597,7 @@ char *getfw (char *fn, size_t *pimgsz);
 int dsp_reload(struct ft1000_device *ft1000dev);
 u16 init_ft1000_netdev(struct ft1000_device *ft1000dev);
 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);
 
 void ft1000InitProc(struct net_device *dev);