diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-02-22 11:08:20 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-02-22 11:08:20 +0100 |
| commit | ea5be87db611d0a7c292790d4b1efd11e4a02fc6 (patch) | |
| tree | 3e5bfb43871527d4c8831e5f81188f2e64d153de /net/bluetooth | |
| parent | ce54e2dda75bbbc9e6bf92476e7be021e35e09b5 (diff) | |
| parent | 97e1efbbe1c8492ea4f804618e26b19325c879fe (diff) | |
Merge branch 'upstream' into for-next
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hidp/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index 6df8ea1c6341..3c036b0933c1 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c @@ -405,7 +405,7 @@ static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, s report_type = HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE; break; case HID_OUTPUT_REPORT: - report_type = HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT; + report_type = HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_OUPUT; break; default: return -EINVAL; |