Unverified Commit 50f70f2d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7962 hwmon: (axi-fan-control) Fix possible NULL pointer dereference 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wenyu Huang <huangwenyu5@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UN47JCGNEU3F77TAHVQO5ORKOYQPCYN2/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RL31 
 
Link:https://gitee.com/openeuler/kernel/pulls/7962

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents f4676530 6d51d255

drivers/hwmon/axi-fan-control.c

+16 −13
Original line number Diff line number Diff line
@@ -423,6 +423,21 @@ static int axi_fan_control_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	ret = axi_fan_control_init(ctl, pdev->dev.of_node);

	if (ret) {

		dev_err(&pdev->dev, "Failed to initialize device\n");

		return ret;

	}



	ctl->hdev = devm_hwmon_device_register_with_info(&pdev->dev,

							 name,

							 ctl,

							 &axi_chip_info,

							 NULL);



	if (IS_ERR(ctl->hdev))

		return PTR_ERR(ctl->hdev);



	ctl->irq = platform_get_irq(pdev, 0);

	if (ctl->irq < 0)

		return ctl->irq;
@@ -436,19 +451,7 @@ static int axi_fan_control_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = axi_fan_control_init(ctl, pdev->dev.of_node);

	if (ret) {

		dev_err(&pdev->dev, "Failed to initialize device\n");

		return ret;

	}



	ctl->hdev = devm_hwmon_device_register_with_info(&pdev->dev,

							 name,

							 ctl,

							 &axi_chip_info,

							 NULL);



	return PTR_ERR_OR_ZERO(ctl->hdev);

	return 0;

}



static struct platform_driver axi_fan_control_driver = {