ams: check return values from device_create_file()
PATCH 1/1 ams: check return values from device_create_file()
This patch changes ams driver in order to check device_create_file() return values and simplifies ams_sensor_attach().
Andrew, I've been using this driver for a while (not with -mm, but applying individual patches on latest -linus daily) and never had problems.
Signed-off-by Aristeu S. Rozanski F. <[email protected]>
drivers/hwmon/ams/ams-core.c +22 -13
@@ -163,28 +163,37 @@ result =pmf_register_irq_client (ams_info.of_node,"accel-int-2" , &ams_shock_client); -if (result <0 ) { -pmf_unregister_irq_client (&ams_freefall_client); -return -ENODEV ; - } +if (result <0 ) + goto release_freefall;/* Create device */ ams_info.of_dev =of_platform_device_create (ams_info.of_node,"ams" ,NULL ); -if (!ams_info.of_dev) { -pmf_unregister_irq_client (&ams_shock_client); -pmf_unregister_irq_client (&ams_freefall_client); -return -ENODEV ; - } +if (!ams_info.of_dev) + goto release_shock;/* Create attributes */ -device_create_file (&ams_info.of_dev->dev, &dev_attr_current); + result =device_create_file (&ams_info.of_dev->dev, &dev_attr_current); +if (result) + goto release_of; ams_info.vflag = !!(ams_info.get_vendor () &0x10 );/* Init mouse device */ -ams_mouse_init (); - -return 0 ; + result =ams_mouse_init (); +if (result) + goto release_device_file; + +out: +return result; +release_device_file: +device_remove_file (&ams_info.of_dev->dev, &dev_attr_current); +release_of: +of_device_unregister (ams_info.of_dev); +release_shock: +pmf_unregister_irq_client (&ams_freefall_client); +release_freefall: +pmf_unregister_irq_client (&ams_freefall_client); + goto out; }int __init ams_init (void )
drivers/hwmon/ams/ams-mouse.c +6 -3
@@ -127,12 +127,15 @@ ams_mouse_show_mouse, ams_mouse_store_mouse);/* Call with ams_info.lock held! */ -void ams_mouse_init () +int ams_mouse_init (void ) { -device_create_file (&ams_info.of_dev->dev, &dev_attr_mouse); +int result; -if (mouse) + result =device_create_file (&ams_info.of_dev->dev, &dev_attr_mouse); + +if (!result && mouse)ams_mouse_enable (); +return result; }/* Call with ams_info.lock held! */
Quoted 4 lines · Aristeu Sergio Rozanski Filho
This patch changes ams driver in order to check
device_create_file()return values and simplifiesams_sensor_attach().Signed-off-by Aristeu S. Rozanski F. <[email protected]>