X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=drivers%2Fhid%2Fhid-core.c;h=62e21cc739381e314908bbd0d6e971a303a11c56;hp=e8387cb95d7f6c9694bd38c9d6822ce285637b2c;hb=d6454706c382ab74e2ecad7803c434cc6bd30343;hpb=11941a321d49cd2cafc8e64f66cbfed60fc1c691

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index e8387cb95d7f..62e21cc73938 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -974,7 +974,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
 
 	if (size < rsize) {
 		dbg("report %d is too short, (%d < %d)", report->id, size, rsize);
-		return -1;
+		memset(data + size, 0, rsize - size);
 	}
 
 	if ((hid->claimed & HID_CLAIMED_HIDDEV) && hid->hiddev_report_event)