From e428368543ab352ea9e68b8304d5fa43fee9c8e7 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed, 9 Jun 2010 11:24:32 +0200
Subject: [PATCH] --- yaml --- r: 207871 b: refs/heads/master c:
 2190a1e7705456c2298873b2547a6eb19b8e31ae h: refs/heads/master i:   207869:
 d7f846e85b6179e6ffe914e1ac7365d4dd0680b1   207867:
 1feb0c0924d66fa0e231a3366546365062b465eb   207863:
 42b921da66660f6ef50d240fd1c5e170da02a756   207855:
 80e183f1ec610bfc4bb2b7c27b4329271c50e5ab   207839:
 4a7a53e5299815701e35181e97db61456f0f84ac   207807:
 79917b2054cd8bd0947127c8b61bc1c7d04dfde7   207743:
 2d510f490d6dbdb944c920dbaaa0a043fe365af7   207615:
 2cf588617a9837f0dfa716d3430358f492eaa32b   207359:
 361bb935f7531cffb9e5ffa083364e7456155534   206847:
 29db89118f965885fbd2aadb37100d5f1393edc4 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/zorro/proc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7a5c95dfa4d1..ed6e0b46d0c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d50ac468dd023db32c9455b2df56237caf601cbd
+refs/heads/master: 2190a1e7705456c2298873b2547a6eb19b8e31ae
diff --git a/trunk/drivers/zorro/proc.c b/trunk/drivers/zorro/proc.c
index 4f4ea88fbb71..cafc50454292 100644
--- a/trunk/drivers/zorro/proc.c
+++ b/trunk/drivers/zorro/proc.c
@@ -68,7 +68,7 @@ proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t *
 	cd.cd_BoardAddr = (void *)zorro_resource_start(z);
 	cd.cd_BoardSize = zorro_resource_len(z);
 
-	if (copy_to_user(buf, &cd, nbytes))
+	if (copy_to_user(buf, (void *)&cd + pos, nbytes))
 		return -EFAULT;
 	*ppos += nbytes;