Skip to contentSkip to conversation

Input: ar1021-i2c - fix too long name in driver's device table

PATCH Superseded Dmitry Torokhov 4 participants 4 messages Dec 12, 2016 – Dec 13, 2016

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Dmitry Torokhov

author maintainer
#0 lore raw

PATCH 1/1 Input: ar1021-i2c - fix too long name in driver's device table

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.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=116211

---
 drivers/input/touchscreen/ar1021_i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/touchscreen/ar1021_i2c.c +1 -1
index 71b5a63..89f9587 100644
@@ -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 },
+	{ "MICROCHIP_AR1021", 0 },
 	{ },
 };
 MODULE_DEVICE_TABLE(i2c, ar1021_i2c_id);
Signature · 5 lines
2.8.0.rc3.226.g39d4020


-- 
Dmitry
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Dmitry Torokhov

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.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=116211

Reviewed-by on v1 1/1
#2 lore raw
In reply to Dmitry Torokhov

2016-12-13 0:57 GMT+01:00 Dmitry Torokhov <[email protected]>:

Quoted 29 lines

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.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=116211

---
 drivers/input/touchscreen/ar1021_i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/touchscreen/ar1021_i2c.c +1 -2
index 71b5a63..89f9587 100644
@@ -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 },
+       { "MICROCHIP_AR1021", 0 },
        { },
 };
 MODULE_DEVICE_TABLE(i2c, ar1021_i2c_id);
--
Quoted 2 lines

2.8.0.rc3.226.g39d4020

#3 lore raw
In reply to Dmitry Torokhov

Hi Dmitry,

Quoted 20 lines · Dmitry Torokhov

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.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=116211

---
 drivers/input/touchscreen/ar1021_i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/touchscreen/ar1021_i2c.c +0 -0
index 71b5a63..89f9587 100644

drivers/input/touchscreen/ar1021_i2c.c static int __maybe_unused ar1021_i2c_resume(struct device *dev) · line 158

Quoted 8 lines
drivers/input/touchscreen/ar1021_i2c.c +1 -1
@@ -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 },
+	{ "MICROCHIP_AR1021", 0 },
 	{ },
 };
 MODULE_DEVICE_TABLE(i2c, ar1021_i2c_id);

For consistency with the rest of the universe, the name should simply be "ar1021". No other driver uses capitals, and the manufacturer name is normally not included, except in very rare cases of incompatible name collisions.

Thanks,

Signature · 2 lines
Jean Delvare
SUSE L3 Support