diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:12:24 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-05-24 18:12:24 -0600 |
| commit | 65addba21f9ad46593688e169dbe11a8686562b2 (patch) | |
| tree | b9673c056d524eb3b6398043ed018659917c57f8 /drivers/w1 | |
| parent | de95aeaf4fe1879b76fa28e517cbca954df20593 (diff) | |
CR ENGR00028658: Add clock enable & disable in Onewire for all platforms
http://www.bitshrine.org/gpp/linux-2.6.19.2-mx-add_1wire_enable_disable.patch
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/masters/mxc_w1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index c9a146096209..6f0c00c82f39 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c @@ -344,7 +344,6 @@ static int __devinit mxc_w1_probe(struct platform_device *pdev) return -ENOMEM; } dev->clk = clk_get(&pdev->dev, "owire_clk"); - dev->bus_master = (struct w1_bus_master *)(dev + 1); dev->found = 1; dev->clkdiv = (clk_get_rate(dev->clk) / 1000000) - 1; @@ -389,6 +388,7 @@ static int mxc_w1_remove(struct platform_device *pdev) { struct mxc_w1_device *dev = platform_get_drvdata(pdev); + clk_disable(dev->clk); clk_put(dev->clk); if (dev->found) { w1_remove_master_device(dev->bus_master); |