From f3aca0721a8eaac750907b1567db640a0065b685 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 1 Oct 2010 11:17:12 +0000 Subject: [PATCH] --- yaml --- r: 214849 b: refs/heads/master c: f009627b71eacfeede3d63b00a25afdf5e3e24bb h: refs/heads/master i: 214847: 50d1b6988bbbf4e987f306168dcbd4dc6558c754 v: v3 --- [refs] | 2 +- trunk/drivers/net/tulip/de4x5.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e2b205cdd7c6..10d42c9281be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8cb16dd9cb571c45bb479a1e4721ce11220a216 +refs/heads/master: f009627b71eacfeede3d63b00a25afdf5e3e24bb diff --git a/trunk/drivers/net/tulip/de4x5.c b/trunk/drivers/net/tulip/de4x5.c index 251c6ce15aea..4dbd493b996b 100644 --- a/trunk/drivers/net/tulip/de4x5.c +++ b/trunk/drivers/net/tulip/de4x5.c @@ -5474,7 +5474,8 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) tmp.lval[6] = inl(DE4X5_STRR); j+=4; tmp.lval[7] = inl(DE4X5_SIGR); j+=4; ioc->len = j; - if (copy_to_user(ioc->data, tmp.lval, ioc->len)) return -EFAULT; + if (copy_to_user(ioc->data, tmp.lval, ioc->len)) + return -EFAULT; break; #define DE4X5_DUMP 0x0f /* Dump the DE4X5 Status */