From patchwork Tue Jun 8 18:25:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 455806 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp4014268jae; Tue, 8 Jun 2021 11:50:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1sRR37Fj4QggVjuUG0acGJa5Mjc9//x6f27FKxSPq5NBxnazBnRPTYjjSwo/ovYlpKE+8 X-Received: by 2002:a05:6402:26ce:: with SMTP id x14mr27337314edd.104.1623178246799; Tue, 08 Jun 2021 11:50:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623178246; cv=none; d=google.com; s=arc-20160816; b=I2roMduyZ5+OsP68csc/XI3jhvQQuPkVBNjVdXfxIuYI2kCiSzUi8ncRae/Ush9Hf9 1nSYCWEJU4Bh9gmvX+s5cZ2qhzGvWao4/enYYqGHaWuzu3WA6qggxUT2p9IHbS6TqmK2 Xy5HFhqpOHZKEodbQ5rrMgQQ5GXp+GhiqHDQXyIgs7oo6wgq1MnuIaY7v1PqcsGdry97 0XqKsPTn3zoG0MnzpcO5RZSb2WmTsrePfLhnliAbu/991a+yqCFJvzYbSTwprm7sUttO qOyUsey23YKlsQofMuJuQnl4/dMlcqDX4XfBte08r1h+fQ6ALNjYn6cytvnCaQAemjg7 9Fng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pt/T5P0qB0mcYVXhy+a7V3SNOlIDxzIYlZv/HlOUkw8=; b=UevKO0jsenOXodrdJSjs8b0iLAqQEHnLXdPz850b8cYSoZLXCzdRqKmOrlJovCy1B2 E32w1j3E1iffBBTc1X4IIMWgPN3yxzbaavfyx4WcK6AVPhlFsDYuvqHKhQqcn0f8lyvm Yra8bphfzu+tQxI3epuqd746m4/VJhIn/pt6a2O0i5fp/Wz/Wz+6Y57e8HsAW3TtFe+N Vkur9K7Van99heSOB0KG9mL1yLQWTc2lZVO4CU9Aely1rl5NlA+OrUf8+dkM5VnNa4uQ EMFJcOKz2nBzKhXM1doRU1o6MSfIx6eW2fa0cJ/ZMcIWGGV6KtZ1n7xqHeHAMDqiSYkz xIPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ra1Y9mSp; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p8si365256ejc.107.2021.06.08.11.50.46; Tue, 08 Jun 2021 11:50:46 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ra1Y9mSp; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235226AbhFHSwE (ORCPT + 12 others); Tue, 8 Jun 2021 14:52:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:49370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236198AbhFHSuE (ORCPT ); Tue, 8 Jun 2021 14:50:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6FC126142F; Tue, 8 Jun 2021 18:39:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623177559; bh=q9xBeJXdMN2qa/6xNirppkC5JiZwWBqkJ8o+Rd9sPcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ra1Y9mSpJ3uiq+UnUPkjHKaRaCMOEnebsCjUUBL26DHtR3RSGNRL4ux03GIvK5e8D 6nN/z+X+A4jPwWqE5in74abJEJwzd6I6cWrb6ijJAZuv7RSQJej5cEpDizAfbztRQy eGFLqbp8/BCglm2aWWkyeh8FlrkQxcnzR3AKGfWo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Nathan Chancellor , Jiri Kosina , Sasha Levin Subject: [PATCH 5.10 017/137] HID: i2c-hid: fix format string mismatch Date: Tue, 8 Jun 2021 20:25:57 +0200 Message-Id: <20210608175942.989042965@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210608175942.377073879@linuxfoundation.org> References: <20210608175942.377073879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ 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 Reviewed-by: Nathan Chancellor Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/i2c-hid/i2c-hid-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c index cb7758d59014..13bc59ed1d9e 100644 --- a/drivers/hid/i2c-hid/i2c-hid-core.c +++ b/drivers/hid/i2c-hid/i2c-hid-core.c @@ -1131,8 +1131,8 @@ static int i2c_hid_probe(struct i2c_client *client, 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);