lkml.org 
[lkml]   [2021]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 019/161] HID: i2c-hid: fix format string mismatch
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit dc5f9f55502e13ba05731d5046a14620aa2ff456 ]

    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>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Sasha Levin <sashal@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);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-06-08 21:14    [W:4.293 / U:0.604 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site