| Message ID | 1353949160-26803-54-git-send-email-herton.krzesinski@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 2012-11-26 at 14:55 -0200, Herton Ronaldo Krzesinski wrote: > 3.5.7u1 -stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Jaehoon Chung <jh80.chung@samsung.com> > > commit 5feb54a1ab91a237e247c013b8c4fb100ea347b1 upstream. > > We can use up to four bus-clocks; but on module remove, we didn't > disable the fourth bus clock. > > Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > Signed-off-by: Chris Ball <cjb@laptop.org> > Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> This is missing from 3.4 and 3.6 (but not 3.2); it apparently needed its context adjusted. Ben. > --- > drivers/mmc/host/sdhci-s3c.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c > index a50c205..02b7a4a 100644 > --- a/drivers/mmc/host/sdhci-s3c.c > +++ b/drivers/mmc/host/sdhci-s3c.c > @@ -656,7 +656,7 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev) > > pm_runtime_disable(&pdev->dev); > > - for (ptr = 0; ptr < 3; ptr++) { > + for (ptr = 0; ptr < MAX_BUS_CLK; ptr++) { > if (sc->clk_bus[ptr]) { > clk_disable(sc->clk_bus[ptr]); > clk_put(sc->clk_bus[ptr]);
On Tue, Nov 27, 2012 at 03:00:13PM +0000, Ben Hutchings wrote: > On Mon, 2012-11-26 at 14:55 -0200, Herton Ronaldo Krzesinski wrote: > > 3.5.7u1 -stable review patch. If anyone has any objections, please let me know. > > > > ------------------ > > > > From: Jaehoon Chung <jh80.chung@samsung.com> > > > > commit 5feb54a1ab91a237e247c013b8c4fb100ea347b1 upstream. > > > > We can use up to four bus-clocks; but on module remove, we didn't > > disable the fourth bus clock. > > > > Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> > > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > > Signed-off-by: Chris Ball <cjb@laptop.org> > > Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> > > This is missing from 3.4 and 3.6 (but not 3.2); it apparently needed its > context adjusted. Thanks, now backported. greg k-h
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index a50c205..02b7a4a 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -656,7 +656,7 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); - for (ptr = 0; ptr < 3; ptr++) { + for (ptr = 0; ptr < MAX_BUS_CLK; ptr++) { if (sc->clk_bus[ptr]) { clk_disable(sc->clk_bus[ptr]); clk_put(sc->clk_bus[ptr]);