/dev/mem: Avoid overwriting "err" in read_mem()

[sfrench/cifs-2.6.git] / drivers / char / mem.c

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 052011bcf10014f086cdc1c54ae47154850eb974..ffeb60d3434c5150650d1ef4c9a3aec3d8ffd59e 100644 (file)
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -137,7 +137,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
 
        while (count > 0) {
                unsigned long remaining;
-               int allowed;
+               int allowed, probe;
 
                sz = size_inside_page(p, count);
 
@@ -160,9 +160,9 @@ static ssize_t read_mem(struct file *file, char __user *buf,
                        if (!ptr)
                                goto failed;
 
-                       err = probe_kernel_read(bounce, ptr, sz);
+                       probe = probe_kernel_read(bounce, ptr, sz);
                        unxlate_dev_mem_ptr(p, ptr);
-                       if (err)
+                       if (probe)
                                goto failed;
 
                        remaining = copy_to_user(buf, bounce, sz);