From ad271eb0b2f1e072f6c0900326a812b85aa45bfa Mon Sep 17 00:00:00 2001 From: Dan Rosenberg Date: Thu, 16 Sep 2010 22:34:26 -0700 Subject: [PATCH] --- yaml --- r: 214559 b: refs/heads/master c: 0c796f91a518480fd6696ba2affed1167e840823 h: refs/heads/master i: 214557: f675ae280ece9ed60398f4f0745b0e194ec4c604 214555: 491662e595d548589ea7bac910d795afae417d74 214551: 8963fbc0478967c59108e04a543e0f98e62547f0 214543: bda5a2737a97337577b0531b5cf527d78c5b9cc5 214527: 28ce22c8619e065e2e1eaf3035bfb9fea95a688d v: v3 --- [refs] | 2 +- trunk/drivers/net/tulip/de4x5.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 216a30977b5d..4d13e5e65067 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd13539b8bc9ae884e6d8d9374c594adff4304e4 +refs/heads/master: 0c796f91a518480fd6696ba2affed1167e840823 diff --git a/trunk/drivers/net/tulip/de4x5.c b/trunk/drivers/net/tulip/de4x5.c index 4f7503063446..1d9fef74b39b 100644 --- a/trunk/drivers/net/tulip/de4x5.c +++ b/trunk/drivers/net/tulip/de4x5.c @@ -5474,7 +5474,7 @@ 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.addr, 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 */