---

yaml --- r: 122889 b: refs/heads/master c: 4cb56b6 h: refs/heads/master i: 122887: 85b4a1a v: v3
git-mirror · Dec 22, 2008 · 20a9aa7 · 20a9aa7
1 parent f3969f5
commit 20a9aa7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93bc933524d05e3b391358e24b3666599f8ec026
+refs/heads/master: 4cb56b685617732733d4d9dffbf8c5a81d4a0c71
diff --git a/trunk/drivers/net/wan/pc300_drv.c b/trunk/drivers/net/wan/pc300_drv.c
@@ -2718,9 +2718,8 @@ static int cpc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 					}
 					pc300patrntst.num_errors =
 						falc_pattern_test_error(card, ch);
-					if (!arg
-					    || copy_to_user(arg, &pc300patrntst,
-							    sizeof (pc300patterntst_t)))
+					if (copy_to_user(arg, &pc300patrntst,
+							 sizeof(pc300patterntst_t)))
 							return -EINVAL;
 				} else {
 					falc_pattern_test(card, ch, pc300patrntst.patrntst_on);