lkml.org 
[lkml]   [2013]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 2/3] hwmon: fix error return code in abituguru_probe()
    Date
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

    commit ecacb0b17c08fae89f65468727f0e4b8e91da4e1 upstream.

    Fix to return a negative error code from the error handling
    case instead of 0, as done elsewhere in this function.

    Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/hwmon/abituguru.c | 16 ++++++++++------
    1 file changed, 10 insertions(+), 6 deletions(-)

    --- a/drivers/hwmon/abituguru.c
    +++ b/drivers/hwmon/abituguru.c
    @@ -1280,14 +1280,18 @@ static int __devinit abituguru_probe(str
    pr_info("found Abit uGuru\n");

    /* Register sysfs hooks */
    - for (i = 0; i < sysfs_attr_i; i++)
    - if (device_create_file(&pdev->dev,
    - &data->sysfs_attr[i].dev_attr))
    + for (i = 0; i < sysfs_attr_i; i++) {
    + res = device_create_file(&pdev->dev,
    + &data->sysfs_attr[i].dev_attr);
    + if (res)
    goto abituguru_probe_error;
    - for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++)
    - if (device_create_file(&pdev->dev,
    - &abituguru_sysfs_attr[i].dev_attr))
    + }
    + for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++) {
    + res = device_create_file(&pdev->dev,
    + &abituguru_sysfs_attr[i].dev_attr);
    + if (res)
    goto abituguru_probe_error;
    + }

    data->hwmon_dev = hwmon_device_register(&pdev->dev);
    if (!IS_ERR(data->hwmon_dev))



    \
     
     \ /
      Last update: 2013-05-23 01:01    [W:2.662 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site