From a62a074bc8a99a86f71de0b182b50e0ff1128d12 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Thu, 25 Dec 2008 18:03:44 -0800
Subject: [PATCH] --- yaml --- r: 122873 b: refs/heads/master c:
 c14ea0ca659d378dd377e417162ebd908d1da4ce h: refs/heads/master i:   122871:
 d833f8e9468a34b2282e6b55b30d7a02e038b4d4 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/wan/pc300_drv.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e8793d72774f..1438acd208c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90f5dfcc6afafcc3e1c18298143c1213b071990d
+refs/heads/master: c14ea0ca659d378dd377e417162ebd908d1da4ce
diff --git a/trunk/drivers/net/wan/pc300_drv.c b/trunk/drivers/net/wan/pc300_drv.c
index d67957af589c..c23fde0c0344 100644
--- 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);