aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/sonypi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/sonypi.c')
-rw-r--r--drivers/char/sonypi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index dbcb3bd192c7..0798754a607c 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -777,7 +777,7 @@ static void input_keyrelease(struct work_struct *work)
777{ 777{
778 struct sonypi_keypress kp; 778 struct sonypi_keypress kp;
779 779
780 while (kfifo_get_locked(&sonypi_device.input_fifo, (unsigned char *)&kp, 780 while (kfifo_out_locked(&sonypi_device.input_fifo, (unsigned char *)&kp,
781 sizeof(kp), &sonypi_device.input_fifo_lock) 781 sizeof(kp), &sonypi_device.input_fifo_lock)
782 == sizeof(kp)) { 782 == sizeof(kp)) {
783 msleep(10); 783 msleep(10);
@@ -828,7 +828,7 @@ static void sonypi_report_input_event(u8 event)
828 if (kp.dev) { 828 if (kp.dev) {
829 input_report_key(kp.dev, kp.key, 1); 829 input_report_key(kp.dev, kp.key, 1);
830 input_sync(kp.dev); 830 input_sync(kp.dev);
831 kfifo_put_locked(&sonypi_device.input_fifo, 831 kfifo_in_locked(&sonypi_device.input_fifo,
832 (unsigned char *)&kp, sizeof(kp), 832 (unsigned char *)&kp, sizeof(kp),
833 &sonypi_device.input_fifo_lock); 833 &sonypi_device.input_fifo_lock);
834 schedule_work(&sonypi_device.input_work); 834 schedule_work(&sonypi_device.input_work);
@@ -882,7 +882,7 @@ found:
882 acpi_bus_generate_proc_event(sonypi_acpi_device, 1, event); 882 acpi_bus_generate_proc_event(sonypi_acpi_device, 1, event);
883#endif 883#endif
884 884
885 kfifo_put_locked(&sonypi_device.fifo, (unsigned char *)&event, 885 kfifo_in_locked(&sonypi_device.fifo, (unsigned char *)&event,
886 sizeof(event), &sonypi_device.fifo_lock); 886 sizeof(event), &sonypi_device.fifo_lock);
887 kill_fasync(&sonypi_device.fifo_async, SIGIO, POLL_IN); 887 kill_fasync(&sonypi_device.fifo_async, SIGIO, POLL_IN);
888 wake_up_interruptible(&sonypi_device.fifo_proc_list); 888 wake_up_interruptible(&sonypi_device.fifo_proc_list);
@@ -932,7 +932,7 @@ static ssize_t sonypi_misc_read(struct file *file, char __user *buf,
932 return ret; 932 return ret;
933 933
934 while (ret < count && 934 while (ret < count &&
935 (kfifo_get_locked(&sonypi_device.fifo, &c, sizeof(c), 935 (kfifo_out_locked(&sonypi_device.fifo, &c, sizeof(c),
936 &sonypi_device.fifo_lock) == sizeof(c))) { 936 &sonypi_device.fifo_lock) == sizeof(c))) {
937 if (put_user(c, buf++)) 937 if (put_user(c, buf++))
938 return -EFAULT; 938 return -EFAULT;