diff options
Diffstat (limited to 'drivers/hid/hid-sony.c')
-rw-r--r-- | drivers/hid/hid-sony.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 677bb3da10e8..68d7b36e31e4 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c | |||
@@ -40,8 +40,7 @@ static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc, | |||
40 | 40 | ||
41 | if ((sc->quirks & VAIO_RDESC_CONSTANT) && | 41 | if ((sc->quirks & VAIO_RDESC_CONSTANT) && |
42 | *rsize >= 56 && rdesc[54] == 0x81 && rdesc[55] == 0x07) { | 42 | *rsize >= 56 && rdesc[54] == 0x81 && rdesc[55] == 0x07) { |
43 | dev_info(&hdev->dev, "Fixing up Sony Vaio VGX report " | 43 | hid_info(hdev, "Fixing up Sony Vaio VGX report descriptor\n"); |
44 | "descriptor\n"); | ||
45 | rdesc[55] = 0x06; | 44 | rdesc[55] = 0x06; |
46 | } | 45 | } |
47 | return rdesc; | 46 | return rdesc; |
@@ -89,7 +88,7 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev) | |||
89 | (3 << 8) | 0xf2, ifnum, buf, 17, | 88 | (3 << 8) | 0xf2, ifnum, buf, 17, |
90 | USB_CTRL_GET_TIMEOUT); | 89 | USB_CTRL_GET_TIMEOUT); |
91 | if (ret < 0) | 90 | if (ret < 0) |
92 | dev_err(&hdev->dev, "can't set operational mode\n"); | 91 | hid_err(hdev, "can't set operational mode\n"); |
93 | 92 | ||
94 | kfree(buf); | 93 | kfree(buf); |
95 | 94 | ||
@@ -110,7 +109,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
110 | 109 | ||
111 | sc = kzalloc(sizeof(*sc), GFP_KERNEL); | 110 | sc = kzalloc(sizeof(*sc), GFP_KERNEL); |
112 | if (sc == NULL) { | 111 | if (sc == NULL) { |
113 | dev_err(&hdev->dev, "can't alloc sony descriptor\n"); | 112 | hid_err(hdev, "can't alloc sony descriptor\n"); |
114 | return -ENOMEM; | 113 | return -ENOMEM; |
115 | } | 114 | } |
116 | 115 | ||
@@ -119,14 +118,14 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
119 | 118 | ||
120 | ret = hid_parse(hdev); | 119 | ret = hid_parse(hdev); |
121 | if (ret) { | 120 | if (ret) { |
122 | dev_err(&hdev->dev, "parse failed\n"); | 121 | hid_err(hdev, "parse failed\n"); |
123 | goto err_free; | 122 | goto err_free; |
124 | } | 123 | } |
125 | 124 | ||
126 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT | | 125 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT | |
127 | HID_CONNECT_HIDDEV_FORCE); | 126 | HID_CONNECT_HIDDEV_FORCE); |
128 | if (ret) { | 127 | if (ret) { |
129 | dev_err(&hdev->dev, "hw start failed\n"); | 128 | hid_err(hdev, "hw start failed\n"); |
130 | goto err_free; | 129 | goto err_free; |
131 | } | 130 | } |
132 | 131 | ||