diff options
Diffstat (limited to 'drivers/hid/hid-apple.c')
| -rw-r--r-- | drivers/hid/hid-apple.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index bba05d0a8980..eaeca564a8d3 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c | |||
| @@ -246,17 +246,18 @@ static int apple_event(struct hid_device *hdev, struct hid_field *field, | |||
| 246 | /* | 246 | /* |
| 247 | * MacBook JIS keyboard has wrong logical maximum | 247 | * MacBook JIS keyboard has wrong logical maximum |
| 248 | */ | 248 | */ |
| 249 | static void apple_report_fixup(struct hid_device *hdev, __u8 *rdesc, | 249 | static __u8 *apple_report_fixup(struct hid_device *hdev, __u8 *rdesc, |
| 250 | unsigned int rsize) | 250 | unsigned int *rsize) |
| 251 | { | 251 | { |
| 252 | struct apple_sc *asc = hid_get_drvdata(hdev); | 252 | struct apple_sc *asc = hid_get_drvdata(hdev); |
| 253 | 253 | ||
| 254 | if ((asc->quirks & APPLE_RDESC_JIS) && rsize >= 60 && | 254 | if ((asc->quirks & APPLE_RDESC_JIS) && *rsize >= 60 && |
| 255 | rdesc[53] == 0x65 && rdesc[59] == 0x65) { | 255 | rdesc[53] == 0x65 && rdesc[59] == 0x65) { |
| 256 | dev_info(&hdev->dev, "fixing up MacBook JIS keyboard report " | 256 | dev_info(&hdev->dev, "fixing up MacBook JIS keyboard report " |
| 257 | "descriptor\n"); | 257 | "descriptor\n"); |
| 258 | rdesc[53] = rdesc[59] = 0xe7; | 258 | rdesc[53] = rdesc[59] = 0xe7; |
| 259 | } | 259 | } |
| 260 | return rdesc; | ||
| 260 | } | 261 | } |
| 261 | 262 | ||
| 262 | static void apple_setup_input(struct input_dev *input) | 263 | static void apple_setup_input(struct input_dev *input) |
