From 20a9aa713199a073b14636411399314ccd6d3ae1 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sun, 21 Dec 2008 16:39:15 +0100 Subject: [PATCH] --- yaml --- r: 122889 b: refs/heads/master c: 4cb56b685617732733d4d9dffbf8c5a81d4a0c71 h: refs/heads/master i: 122887: 85b4a1a309d4bcc8924444375522690e24d71e7c 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 9d3a6d2a18a5..8d16675e3945 100644 --- 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 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);