From: Atsushi Nemoto Fix genrtc's read() routine for 64-bit platforms. Current gen_rtc_read() stores 64bit integer and returns 8 even if an user tried to read a 32bit integer. Signed-off-by: Atsushi Nemoto Cc: Alessandro Zummo Signed-off-by: Andrew Morton --- drivers/char/genrtc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/char/genrtc.c~genrtc-fix-read-on-64-bit-platforms drivers/char/genrtc.c --- devel/drivers/char/genrtc.c~genrtc-fix-read-on-64-bit-platforms 2006-04-29 23:39:37.000000000 -0700 +++ devel-akpm/drivers/char/genrtc.c 2006-04-29 23:39:37.000000000 -0700 @@ -200,13 +200,13 @@ static ssize_t gen_rtc_read(struct file /* first test allows optimizer to nuke this case for 32-bit machines */ if (sizeof (int) != sizeof (long) && count == sizeof (unsigned int)) { unsigned int uidata = data; - retval = put_user(uidata, (unsigned long __user *)buf); + retval = put_user(uidata, (unsigned int __user *)buf) ?: + sizeof(unsigned int); } else { - retval = put_user(data, (unsigned long __user *)buf); + retval = put_user(data, (unsigned long __user *)buf) ?: + sizeof(unsigned long); } - if (!retval) - retval = sizeof(unsigned long); out: current->state = TASK_RUNNING; remove_wait_queue(&gen_rtc_wait, &wait); _