Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 13b3c3fa27f8f4ed306ce624f446fab000dd8ee4

Authored by Jean Delvare
Committed by Jean Delvare
1 parent 9824b8f113
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

hwmon: (atxp1) Fix device detection logic 

The atxp1 device detection code has a major logic flaw, fix it. Not
sure how we managed to miss this when the driver was merged...

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Sebastian Witt <se.witt@gmx.net>

Showing 1 changed file with 9 additions and 9 deletions Side-by-side Diff

drivers/hwmon/atxp1.c
Diff comments   View file @ 13b3c3f
... ... @@ -31,7 +31,7 @@
31 31  
32 32 MODULE_LICENSE("GPL");
33 33 MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");
34   -MODULE_VERSION("0.6.2");
  34 +MODULE_VERSION("0.6.3");
35 35 MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");
36 36  
37 37 #define ATXP1_VID 0x00
38 38  
39 39  
... ... @@ -289,16 +289,16 @@
289 289 if (!((i2c_smbus_read_byte_data(new_client, 0x3e) == 0) &&
290 290 (i2c_smbus_read_byte_data(new_client, 0x3f) == 0) &&
291 291 (i2c_smbus_read_byte_data(new_client, 0xfe) == 0) &&
292   - (i2c_smbus_read_byte_data(new_client, 0xff) == 0) )) {
  292 + (i2c_smbus_read_byte_data(new_client, 0xff) == 0)))
  293 + return -ENODEV;
293 294  
294   - /* No vendor ID, now checking if registers 0x10,0x11 (non-existent)
295   - * showing the same as register 0x00 */
296   - temp = i2c_smbus_read_byte_data(new_client, 0x00);
  295 + /* No vendor ID, now checking if registers 0x10,0x11 (non-existent)
  296 + * showing the same as register 0x00 */
  297 + temp = i2c_smbus_read_byte_data(new_client, 0x00);
297 298  
298   - if (!((i2c_smbus_read_byte_data(new_client, 0x10) == temp) &&
299   - (i2c_smbus_read_byte_data(new_client, 0x11) == temp) ))
300   - return -ENODEV;
301   - }
  299 + if (!((i2c_smbus_read_byte_data(new_client, 0x10) == temp) &&
  300 + (i2c_smbus_read_byte_data(new_client, 0x11) == temp)))
  301 + return -ENODEV;
302 302  
303 303 /* Get VRM */
304 304 temp = vid_which_vrm();