[PATCH] hpet: fix HPET_INFO calls from kernel space

[pandora-kernel.git] / drivers / char / hpet.c

diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 8e59639..c85d11d 100644 (file)
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -500,8 +500,12 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
                            readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
                        info.hi_hpet = devp->hd_hpets->hp_which;
                        info.hi_timer = devp - devp->hd_hpets->hp_dev;
-                       if (copy_to_user((void __user *)arg, &info, sizeof(info)))
-                               err = -EFAULT;
+                       if (kernel)
+                               memcpy((void *)arg, &info, sizeof(info));
+                       else
+                               if (copy_to_user((void __user *)arg, &info,
+                                                sizeof(info)))
+                                       err = -EFAULT;
                        break;
                }
        case HPET_EPI: