Commit bd886137 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'i2c/for-current' of git://

Pull i2c fix from Wolfram Sang:
 "A simple but worthwhile I2C driver fix for 4.16"

* 'i2c/for-current' of git://
  i2c: i2c-stm32f7: fix no check on returned setup
parents ef82f598 771b7bf0
......@@ -888,6 +888,11 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
setup = of_device_get_match_data(&pdev->dev);
if (!setup) {
dev_err(&pdev->dev, "Can't get device data\n");
ret = -ENODEV;
goto clk_free;
i2c_dev->setup = *setup;
ret = device_property_read_u32(i2c_dev->dev, "i2c-scl-rising-time-ns",
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment