---

yaml --- r: 214849 b: refs/heads/master c: f009627 h: refs/heads/master i: 214847: 50d1b69 v: v3
git-mirror · Oct 4, 2010 · f3aca07 · f3aca07
1 parent dfe6570
commit f3aca07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 */