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;