---

yaml --- r: 338249 b: refs/heads/master c: f884c19 h: refs/heads/master i: 338247: 1c0a57e v: v3
git-mirror · Nov 27, 2012 · 36d4c83 · 36d4c83
1 parent 785e194
commit 36d4c83
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64bce09563a2a4b7614583f14a7ee55b0e083949
+refs/heads/master: f884c19224dc190d47251031814857c652d8a563
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
@@ -205,15 +205,14 @@ int ft1000_init_proc(struct net_device *dev)
 {
 	struct ft1000_info *info;
 	struct proc_dir_entry *ft1000_proc_file;
-	int ret = 0;
+	int ret = -EINVAL;
 
 	info = netdev_priv(dev);
 
 	info->ft1000_proc_dir = proc_mkdir(FT1000_PROC_DIR, FTNET_PROC);
 	if (info->ft1000_proc_dir == NULL) {
 		printk(KERN_WARNING "Unable to create %s dir.\n",
 			FT1000_PROC_DIR);
-		ret = -EINVAL;
 		goto fail;
 	}
 
@@ -223,7 +222,6 @@ int ft1000_init_proc(struct net_device *dev)
 
 	if (ft1000_proc_file == NULL) {
 		printk(KERN_WARNING "Unable to create /proc entry.\n");
-		ret = -EINVAL;
 		goto fail_entry;
 	}