From a8226f0fbc994ccd7830d0e3c512b70e48caa3cb Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@gmail.com>
Date: Fri, 15 Oct 2010 09:41:45 +0200
Subject: [PATCH] --- yaml --- r: 220367 b: refs/heads/master c:
 aaf0885c30449d7b40d7cb5b07d6ff64b419c0d1 h: refs/heads/master i:   220365:
 ac161ca2ea474c3971939a784476c0bbebe5cb67   220363:
 7ef0cc3c2ab8419d52ccf9429fe0adc83c0ea22d   220359:
 492804de819cf26218aaa6b62f0a8c7fa3fa2681   220351:
 2637c1302711c101ca877b7268d1306ea7fed0fe v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c  | 6 +++---
 trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 4 +++-
 trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index baa5cd5b2a82..e669ad4c850b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78890fdb24e2f61c22a9bf75270e14018bff83c5
+refs/heads/master: aaf0885c30449d7b40d7cb5b07d6ff64b419c0d1
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 1f91f2242ce4..46ce17cf19da 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -1103,7 +1103,7 @@ u16 init_ft1000_netdev(struct ft1000_device *ft1000dev)
 // 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/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
index a2c415e1b8f7..5fae9547247d 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/trunk/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/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 4368b49f66a3..2bc27f501441 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/trunk/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);