diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-10 09:44:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-10 09:44:53 -0700 |
| commit | b77b907fae863f3bc546a336a8bc5e660d371788 (patch) | |
| tree | 51ea4f5d2ea9c82a7d4ba51dcef7b525b18d6a6d /drivers/hid/hid-sony.c | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
| parent | fde4e2f73208b8f34f123791e39c0cb6bc74b32a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: fix suspend crash by moving initializations earlier
HID: sony: fix sony_set_operational_bt
HID: ntrig: Remove unused macro, TripleTap and QuadTap
HID: ntrig: TipSwitch for single touch mode touch.
HID: hidraw: fix numbered reports
HID: wacom: remove annoying non-error printk
HID: ntrig: Emit TOUCH with DOUBLETAP for single touch
HID: add support for cymotion master solar keyboard
HID: ntrig: explain firmware quirk
HID: fix N-trig touch panel with recent firmware
Diffstat (limited to 'drivers/hid/hid-sony.c')
| -rw-r--r-- | drivers/hid/hid-sony.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 7502a4b2fa86..402d5574b574 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -76,7 +76,7 @@ static int sony_set_operational_usb(struct hid_device *hdev) static int sony_set_operational_bt(struct hid_device *hdev) { - unsigned char buf[] = { 0x53, 0xf4, 0x42, 0x03, 0x00, 0x00 }; + unsigned char buf[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 }; return hdev->hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT); } |