| Message ID | 20210514135901.2924982-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | dc5f9f55502e13ba05731d5046a14620aa2ff456 |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | HID: i2c-hid: fix format string mismatch | expand |
On 5/14/2021 6:58 AM, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > clang doesn't like printing a 32-bit integer using %hX format string: > > drivers/hid/i2c-hid/i2c-hid-core.c:994:18: error: format specifies type 'unsigned short' but the argument has type '__u32' (aka 'unsigned int') [-Werror,-Wformat] > client->name, hid->vendor, hid->product); > ^~~~~~~~~~~ > drivers/hid/i2c-hid/i2c-hid-core.c:994:31: error: format specifies type 'unsigned short' but the argument has type '__u32' (aka 'unsigned int') [-Werror,-Wformat] > client->name, hid->vendor, hid->product); > ^~~~~~~~~~~~ > > Use an explicit cast to truncate it to the low 16 bits instead. > > Fixes: 9ee3e06610fd ("HID: i2c-hid: override HID descriptors for certain devices") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Nathan Chancellor <nathan@kernel.org> > --- > drivers/hid/i2c-hid/i2c-hid-core.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c > index 9993133989a5..f9d28ad17d9c 100644 > --- a/drivers/hid/i2c-hid/i2c-hid-core.c > +++ b/drivers/hid/i2c-hid/i2c-hid-core.c > @@ -990,8 +990,8 @@ int i2c_hid_core_probe(struct i2c_client *client, struct i2chid_ops *ops, > hid->vendor = le16_to_cpu(ihid->hdesc.wVendorID); > hid->product = le16_to_cpu(ihid->hdesc.wProductID); > > - snprintf(hid->name, sizeof(hid->name), "%s %04hX:%04hX", > - client->name, hid->vendor, hid->product); > + snprintf(hid->name, sizeof(hid->name), "%s %04X:%04X", > + client->name, (u16)hid->vendor, (u16)hid->product); > strlcpy(hid->phys, dev_name(&client->dev), sizeof(hid->phys)); > > ihid->quirks = i2c_hid_lookup_quirk(hid->vendor, hid->product); >
On Fri, 14 May 2021, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > clang doesn't like printing a 32-bit integer using %hX format string: > > drivers/hid/i2c-hid/i2c-hid-core.c:994:18: error: format specifies type 'unsigned short' but the argument has type '__u32' (aka 'unsigned int') [-Werror,-Wformat] > client->name, hid->vendor, hid->product); > ^~~~~~~~~~~ > drivers/hid/i2c-hid/i2c-hid-core.c:994:31: error: format specifies type 'unsigned short' but the argument has type '__u32' (aka 'unsigned int') [-Werror,-Wformat] > client->name, hid->vendor, hid->product); > ^~~~~~~~~~~~ > > Use an explicit cast to truncate it to the low 16 bits instead. > > Fixes: 9ee3e06610fd ("HID: i2c-hid: override HID descriptors for certain devices") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied, thanks Arnd.
diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c index 9993133989a5..f9d28ad17d9c 100644 --- a/drivers/hid/i2c-hid/i2c-hid-core.c +++ b/drivers/hid/i2c-hid/i2c-hid-core.c @@ -990,8 +990,8 @@ int i2c_hid_core_probe(struct i2c_client *client, struct i2chid_ops *ops, hid->vendor = le16_to_cpu(ihid->hdesc.wVendorID); hid->product = le16_to_cpu(ihid->hdesc.wProductID); - snprintf(hid->name, sizeof(hid->name), "%s %04hX:%04hX", - client->name, hid->vendor, hid->product); + snprintf(hid->name, sizeof(hid->name), "%s %04X:%04X", + client->name, (u16)hid->vendor, (u16)hid->product); strlcpy(hid->phys, dev_name(&client->dev), sizeof(hid->phys)); ihid->quirks = i2c_hid_lookup_quirk(hid->vendor, hid->product);