Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa29e97b authored by Wu Fengguang's avatar Wu Fengguang Committed by Linus Torvalds
Browse files

/dev/mem: cleanup unxlate_dev_mem_ptr() calls 



No behaviour change.

[akpm@linux-foundation.org: cleanuplets]
[akpm@linux-foundation.org: remove unused `ret']
Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Acked-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Avi Kivity <avi@qumranet.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f222318e

drivers/char/mem.c

+6 −8
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ static ssize_t read_mem(struct file * file, char __user * buf, 
#endif



	while (count > 0) {

		unsigned long remaining;



		sz = size_inside_page(p, count);



		if (!range_is_allowed(p >> PAGE_SHIFT, count))
@@ -168,12 +170,10 @@ static ssize_t read_mem(struct file * file, char __user * buf, 
		if (!ptr)

			return -EFAULT;



		if (copy_to_user(buf, ptr, sz)) {

		remaining = copy_to_user(buf, ptr, sz);

		unxlate_dev_mem_ptr(p, ptr);

		if (remaining)

			return -EFAULT;

		}



		unxlate_dev_mem_ptr(p, ptr);



		buf += sz;

		p += sz;
@@ -231,16 +231,14 @@ static ssize_t write_mem(struct file * file, const char __user * buf, 
		}



		copied = copy_from_user(ptr, buf, sz);

		unxlate_dev_mem_ptr(p, ptr);

		if (copied) {

			written += sz - copied;

			unxlate_dev_mem_ptr(p, ptr);

			if (written)

				break;

			return -EFAULT;

		}



		unxlate_dev_mem_ptr(p, ptr);



		buf += sz;

		p += sz;

		count -= sz;