]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Input: ar1021_i2c - fix too long name in driver's device table
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 12 Dec 2016 23:32:57 +0000 (15:32 -0800)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:33:48 +0000 (21:33 -0400)
[ Upstream commit 95123fc43560d6f4a60e74f72836e63cd8848f76 ]

The name field in structure i2c_device_id is 20 characters, and we expect
it to be NULL-terminated, however we are trying to stuff it with 21 bytes
and thus NULL-terminator is lost. This causes issues when one creates
device with name "MICROCHIP_AR1021_I2C" as i2c core cuts off the last "C",
and automatic module loading by alias does not work as result.

The -I2C suffix in the device name is superfluous, we know what bus we are
dealing with, so let's drop it. Also, no other driver uses capitals, and
the manufacturer name is normally not included, except in very rare cases
of incompatible name collisions.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=116211
Fixes: dd4cae8bf166 ("Input: Add Microchip AR1021 i2c touchscreen")
Reviewed-By: Christian Gmeiner <christian.gmeiner@gmail.com>
Tested-by: Martin Kepplinger <martin.kepplinger@ginzinger.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
drivers/input/touchscreen/ar1021_i2c.c

index f0b954d46a259726d94766e0191f4523351c748a..b89fbc4d30960e0c333b2a831ad46116ce725ca1 100644 (file)
@@ -152,7 +152,7 @@ static int __maybe_unused ar1021_i2c_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(ar1021_i2c_pm, ar1021_i2c_suspend, ar1021_i2c_resume);
 
 static const struct i2c_device_id ar1021_i2c_id[] = {
-       { "MICROCHIP_AR1021_I2C", 0 },
+       { "ar1021", 0 },
        { },
 };
 MODULE_DEVICE_TABLE(i2c, ar1021_i2c_id);