HID: multitouch: Fix typo in config check

Message ID 20230202144149.1.I7f213388b358718068c63acb698dc4937716cf35@changeid
State New
Headers
Series HID: multitouch: Fix typo in config check |

Commit Message

Allen Ballway Feb. 2, 2023, 2:47 p.m. UTC
  Fixes a typo causing a config check to look for a nonexistent config,
leaving the affected code unusable.

Signed-off-by: Allen Ballway <ballway@chromium.org>
---

 drivers/hid/hid-quirks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.39.1.456.gfc5497dd1b-goog
  

Comments

kernel test robot Feb. 3, 2023, 3:18 a.m. UTC | #1
Hi Allen,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on hid/for-next]
[also build test ERROR on next-20230202]
[cannot apply to linus/master v6.2-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Allen-Ballway/HID-multitouch-Fix-typo-in-config-check/20230202-224919
base:   https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git for-next
patch link:    https://lore.kernel.org/r/20230202144149.1.I7f213388b358718068c63acb698dc4937716cf35%40changeid
patch subject: [PATCH] HID: multitouch: Fix typo in config check
config: x86_64-randconfig-a006 (https://download.01.org/0day-ci/archive/20230203/202302031117.u6FdSXY2-lkp@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-8) 11.3.0
reproduce (this is a W=1 build):
        # https://github.com/intel-lab-lkp/linux/commit/a2331d08db1030f3e3f2e0d9c9232780c27d954a
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Allen-Ballway/HID-multitouch-Fix-typo-in-config-check/20230202-224919
        git checkout a2331d08db1030f3e3f2e0d9c9232780c27d954a
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        make W=1 O=build_dir ARCH=x86_64 olddefconfig
        make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   ld: vmlinux.o: in function `hid_lookup_quirk':
>> drivers/hid/hid-quirks.c:1305: undefined reference to `i2c_hid_get_dmi_quirks'


vim +1305 drivers/hid/hid-quirks.c

d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1258  
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1259  /**
0603616a5bf6cd Randy Dunlap       2021-01-19  1260   * hid_lookup_quirk - return any quirks associated with a HID device
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1261   * @hdev: the HID device to look for
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1262   *
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1263   * Description:
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1264   *     Given a HID device, return any quirks associated with that device.
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1265   *
0603616a5bf6cd Randy Dunlap       2021-01-19  1266   * Return: an unsigned long quirks value.
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1267   */
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1268  unsigned long hid_lookup_quirk(const struct hid_device *hdev)
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1269  {
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1270  	unsigned long quirks = 0;
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1271  	const struct hid_device_id *quirk_entry = NULL;
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1272  
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1273  	/* NCR devices must not be queried for reports */
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1274  	if (hdev->bus == BUS_USB &&
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1275  	    hdev->vendor == USB_VENDOR_ID_NCR &&
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1276  	    hdev->product >= USB_DEVICE_ID_NCR_FIRST &&
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1277  	    hdev->product <= USB_DEVICE_ID_NCR_LAST)
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1278  		return HID_QUIRK_NO_INIT_REPORTS;
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1279  
d5158e020c4593 Niels Skou Olsen   2017-10-04  1280  	/* These devices must be ignored if version (bcdDevice) is too old */
d5158e020c4593 Niels Skou Olsen   2017-10-04  1281  	if (hdev->bus == BUS_USB && hdev->vendor == USB_VENDOR_ID_JABRA) {
d5158e020c4593 Niels Skou Olsen   2017-10-04  1282  		switch (hdev->product) {
d5158e020c4593 Niels Skou Olsen   2017-10-04  1283  		case USB_DEVICE_ID_JABRA_SPEAK_410:
d5158e020c4593 Niels Skou Olsen   2017-10-04  1284  			if (hdev->version < 0x0111)
d5158e020c4593 Niels Skou Olsen   2017-10-04  1285  				return HID_QUIRK_IGNORE;
d5158e020c4593 Niels Skou Olsen   2017-10-04  1286  			break;
d5158e020c4593 Niels Skou Olsen   2017-10-04  1287  		case USB_DEVICE_ID_JABRA_SPEAK_510:
d5158e020c4593 Niels Skou Olsen   2017-10-04  1288  			if (hdev->version < 0x0214)
d5158e020c4593 Niels Skou Olsen   2017-10-04  1289  				return HID_QUIRK_IGNORE;
d5158e020c4593 Niels Skou Olsen   2017-10-04  1290  			break;
d5158e020c4593 Niels Skou Olsen   2017-10-04  1291  		}
d5158e020c4593 Niels Skou Olsen   2017-10-04  1292  	}
d5158e020c4593 Niels Skou Olsen   2017-10-04  1293  
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1294  	mutex_lock(&dquirks_lock);
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1295  	quirk_entry = hid_exists_dquirk(hdev);
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1296  	if (quirk_entry)
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1297  		quirks = quirk_entry->driver_data;
6e65d9d5492f37 Benjamin Tissoires 2017-11-20  1298  	else
6e65d9d5492f37 Benjamin Tissoires 2017-11-20  1299  		quirks = hid_gets_squirk(hdev);
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1300  	mutex_unlock(&dquirks_lock);
d5d3e202753cc0 Benjamin Tissoires 2017-11-20  1301  
a2f416bf062a38 Allen Ballway      2023-01-10  1302  	/* Get quirks specific to I2C devices */
a2331d08db1030 Allen Ballway      2023-02-02  1303  	if (IS_ENABLED(CONFIG_I2C_HID_CORE) && IS_ENABLED(CONFIG_DMI) &&
a2f416bf062a38 Allen Ballway      2023-01-10  1304  	    hdev->bus == BUS_I2C)
a2f416bf062a38 Allen Ballway      2023-01-10 @1305  		quirks |= i2c_hid_get_dmi_quirks(hdev->vendor, hdev->product);
  
kernel test robot Feb. 3, 2023, 6:52 a.m. UTC | #2
Hi Allen,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on hid/for-next]
[also build test ERROR on next-20230203]
[cannot apply to linus/master v6.2-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Allen-Ballway/HID-multitouch-Fix-typo-in-config-check/20230202-224919
base:   https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git for-next
patch link:    https://lore.kernel.org/r/20230202144149.1.I7f213388b358718068c63acb698dc4937716cf35%40changeid
patch subject: [PATCH] HID: multitouch: Fix typo in config check
config: x86_64-randconfig-a003 (https://download.01.org/0day-ci/archive/20230203/202302031440.9V6esF8X-lkp@intel.com/config)
compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/intel-lab-lkp/linux/commit/a2331d08db1030f3e3f2e0d9c9232780c27d954a
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Allen-Ballway/HID-multitouch-Fix-typo-in-config-check/20230202-224919
        git checkout a2331d08db1030f3e3f2e0d9c9232780c27d954a
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 olddefconfig
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> ld.lld: error: undefined symbol: i2c_hid_get_dmi_quirks
   >>> referenced by hid-quirks.c:1305 (drivers/hid/hid-quirks.c:1305)
   >>>               vmlinux.o:(hid_lookup_quirk)
  

Patch

diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 78452faf3c9b4..8417066b5ff72 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -1300,7 +1300,7 @@  unsigned long hid_lookup_quirk(const struct hid_device *hdev)
 	mutex_unlock(&dquirks_lock);

 	/* Get quirks specific to I2C devices */
-	if (IS_ENABLED(CONFIG_I2C_DMI_CORE) && IS_ENABLED(CONFIG_DMI) &&
+	if (IS_ENABLED(CONFIG_I2C_HID_CORE) && IS_ENABLED(CONFIG_DMI) &&
 	    hdev->bus == BUS_I2C)
 		quirks |= i2c_hid_get_dmi_quirks(hdev->vendor, hdev->product);