Merge 3.14-rc4 into tty-next

We want the tty revert here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index d50e7313b171..a713e6211419 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -1178,7 +1178,7 @@ static void hidinput_led_worker(struct work_struct *work)
 
         /* fall back to generic raw-output-report */
         len = ((report->size - 1) >> 3) + 1 + (report->id > 0);
-        buf = kmalloc(len, GFP_KERNEL);
+        buf = hid_alloc_report_buf(report, GFP_KERNEL);
         if (!buf)
                 return;