---

yaml --- r: 353882 b: refs/heads/master c: a11b0e8 h: refs/heads/master v: v3
git-mirror · Jan 7, 2013 · 091c32a · 091c32a
1 parent 5c07a20
commit 091c32a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dedbc93318b89c0386670a5c3e1de621311a40b0
+refs/heads/master: a11b0e860bff66d20d7d88211df58620619a0fcd
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -702,7 +702,7 @@ int init_ft1000_netdev(struct ft1000_usb *ft1000dev)
 	int i, ret_val;
 	struct list_head *cur, *tmp;
 	char card_nr[2];
-	unsigned long gCardIndex = 0;
+	u8 gCardIndex = 0;
 
 	DEBUG("Enter init_ft1000_netdev...\n");
 
@@ -723,7 +723,7 @@ int init_ft1000_netdev(struct ft1000_usb *ft1000dev)
 	if (strncmp(netdev->name, "eth", 3) == 0) {
 		card_nr[0] = netdev->name[3];
 		card_nr[1] = '\0';
-		ret_val = strict_strtoul(card_nr, 10, &gCardIndex);
+		ret_val = kstrtou8(card_nr, 10, &gCardIndex);
 		if (ret_val) {
 			printk(KERN_ERR "Can't parse netdev\n");
 			goto err_net;