The driver should clean up after itself by unpreparing the clock when it
is unbound.

Signed-off-by: Krzysztof Kozlowski <[email protected]>
Reviewed-by: Javier Martinez Canillas <[email protected]>

---

Changes since v1:
1. Add Javier's tag.
2. Follow Javier's suggestion - the 'hub' cannot be null now.
---
 drivers/usb/misc/usb3503.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c
index 0cf2987b322f..8e7737d7ac0a 100644
--- a/drivers/usb/misc/usb3503.c
+++ b/drivers/usb/misc/usb3503.c
@@ -330,6 +330,17 @@ static int usb3503_i2c_probe(struct i2c_client *i2c,
        return usb3503_probe(hub);
 }
 
+static int usb3503_i2c_remove(struct i2c_client *i2c)
+{
+       struct usb3503 *hub;
+
+       hub = i2c_get_clientdata(i2c);
+       if (hub->clk)
+               clk_disable_unprepare(hub->clk);
+
+       return 0;
+}
+
 static int usb3503_platform_probe(struct platform_device *pdev)
 {
        struct usb3503 *hub;
@@ -343,6 +354,17 @@ static int usb3503_platform_probe(struct platform_device 
*pdev)
        return usb3503_probe(hub);
 }
 
+static int usb3503_platform_remove(struct platform_device *pdev)
+{
+       struct usb3503 *hub;
+
+       hub = platform_get_drvdata(pdev);
+       if (hub->clk)
+               clk_disable_unprepare(hub->clk);
+
+       return 0;
+}
+
 #ifdef CONFIG_PM_SLEEP
 static int usb3503_i2c_suspend(struct device *dev)
 {
@@ -396,6 +418,7 @@ static struct i2c_driver usb3503_i2c_driver = {
                .of_match_table = of_match_ptr(usb3503_of_match),
        },
        .probe          = usb3503_i2c_probe,
+       .remove         = usb3503_i2c_remove,
        .id_table       = usb3503_id,
 };
 
@@ -405,6 +428,7 @@ static struct platform_driver usb3503_platform_driver = {
                .of_match_table = of_match_ptr(usb3503_of_match),
        },
        .probe          = usb3503_platform_probe,
+       .remove         = usb3503_platform_remove,
 };
 
 static int __init usb3503_init(void)
-- 
1.9.1

Reply via email to