diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-05-05 15:45:48 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-05-05 15:45:48 +1000 |
| commit | f18fc729cd2d67b76e24206ee3567c1f6983c358 (patch) | |
| tree | 9dbf177222d94213d9dd82d67de6d905e1a2b278 /drivers/char/genrtc.c | |
| parent | 5a43ee65620d628ba04deecf241b63b2410b97f2 (diff) | |
| parent | d98550e334715b2d9e45f8f0f4e1608720108640 (diff) | |
| download | kernel_samsung_smdk4412-f18fc729cd2d67b76e24206ee3567c1f6983c358.zip kernel_samsung_smdk4412-f18fc729cd2d67b76e24206ee3567c1f6983c358.tar.gz kernel_samsung_smdk4412-f18fc729cd2d67b76e24206ee3567c1f6983c358.tar.bz2 | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/char/genrtc.c')
| -rw-r--r-- | drivers/char/genrtc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c index d3a2bc3..588fca5 100644 --- a/drivers/char/genrtc.c +++ b/drivers/char/genrtc.c @@ -200,13 +200,13 @@ static ssize_t gen_rtc_read(struct file *file, char __user *buf, /* 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); |