Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[deliverable/linux.git] / drivers / hid / hid-debug.c

diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 1086800693b211000a40812d3dc986eeff8d6da0..2886b645ced73808fe0f4d507823cf459ef70914 100644 (file)
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -165,6 +165,7 @@ static const struct hid_usage_entry hid_usage_table[] = {
     {0, 0x53, "DeviceIndex"},
     {0, 0x54, "ContactCount"},
     {0, 0x55, "ContactMaximumNumber"},
+    {0, 0x59, "ButtonType"},
     {0, 0x5A, "SecondaryBarrelSwitch"},
     {0, 0x5B, "TransducerSerialNumber"},
   { 15, 0, "PhysicalInterfaceDevice" },
@@ -1127,7 +1128,8 @@ static ssize_t hid_debug_events_read(struct file *file, char __user *buffer,
 
                                if (!list->hdev || !list->hdev->debug) {
                                        ret = -EIO;
-                                       break;
+                                       set_current_state(TASK_RUNNING);
+                                       goto out;
                                }
 
                                /* allow O_NONBLOCK from other threads */