i2c: bcm2835: Store pointer to bus clock

The commit bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF") introduced
a NULL pointer dereference on driver unload. It seems that we can't fetch
the bus clock via devm_clk_get in bcm2835_i2c_remove. As an alternative
approach store a pointer to the bus clock in the private driver structure.

Fixes: bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF")
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

authored by Stefan Wahren and committed by Wolfram Sang 3b722da6 42052d96

Changed files
+8 -9
drivers
i2c
busses
+8 -9
drivers/i2c/busses/i2c-bcm2835.c
··· 58 58 struct i2c_adapter adapter; 59 59 struct completion completion; 60 60 struct i2c_msg *curr_msg; 61 + struct clk *bus_clk; 61 62 int num_msgs; 62 63 u32 msg_err; 63 64 u8 *msg_buf; ··· 405 404 struct resource *mem, *irq; 406 405 int ret; 407 406 struct i2c_adapter *adap; 408 - struct clk *bus_clk; 409 407 struct clk *mclk; 410 408 u32 bus_clk_rate; 411 409 ··· 427 427 return PTR_ERR(mclk); 428 428 } 429 429 430 - bus_clk = bcm2835_i2c_register_div(&pdev->dev, mclk, i2c_dev); 430 + i2c_dev->bus_clk = bcm2835_i2c_register_div(&pdev->dev, mclk, i2c_dev); 431 431 432 - if (IS_ERR(bus_clk)) { 432 + if (IS_ERR(i2c_dev->bus_clk)) { 433 433 dev_err(&pdev->dev, "Could not register clock\n"); 434 - return PTR_ERR(bus_clk); 434 + return PTR_ERR(i2c_dev->bus_clk); 435 435 } 436 436 437 437 ret = of_property_read_u32(pdev->dev.of_node, "clock-frequency", ··· 442 442 bus_clk_rate = 100000; 443 443 } 444 444 445 - ret = clk_set_rate_exclusive(bus_clk, bus_clk_rate); 445 + ret = clk_set_rate_exclusive(i2c_dev->bus_clk, bus_clk_rate); 446 446 if (ret < 0) { 447 447 dev_err(&pdev->dev, "Could not set clock frequency\n"); 448 448 return ret; 449 449 } 450 450 451 - ret = clk_prepare_enable(bus_clk); 451 + ret = clk_prepare_enable(i2c_dev->bus_clk); 452 452 if (ret) { 453 453 dev_err(&pdev->dev, "Couldn't prepare clock"); 454 454 return ret; ··· 491 491 static int bcm2835_i2c_remove(struct platform_device *pdev) 492 492 { 493 493 struct bcm2835_i2c_dev *i2c_dev = platform_get_drvdata(pdev); 494 - struct clk *bus_clk = devm_clk_get(i2c_dev->dev, "div"); 495 494 496 - clk_rate_exclusive_put(bus_clk); 497 - clk_disable_unprepare(bus_clk); 495 + clk_rate_exclusive_put(i2c_dev->bus_clk); 496 + clk_disable_unprepare(i2c_dev->bus_clk); 498 497 499 498 free_irq(i2c_dev->irq, i2c_dev); 500 499 i2c_del_adapter(&i2c_dev->adapter);