Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: 7131/1: clkdev: Add Common Macro for clk_lookup
  clk: spi-pl022: convert to clk_prepare()/clk_unprepare()
  clk: timer-sp: convert to clk_prepare()/clk_unprepare()
  clk: sa1111: convert to clk_prepare()/clk_unprepare()
  clk: mmci: convert to clk_prepare()/clk_unprepare()
  clk: amba-pl011: convert to clk_prepare()/clk_unprepare()
  clk: amba-pl010: convert to clk_prepare()/clk_unprepare()
  clk: amba-clcd: convert to clk_prepare()/clk_unprepare()
  clk: amba bus: convert to clk_prepare()/clk_unprepare()
  clk: provide prepare/unprepare functions

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index 3520cf955b95..1ab2fa0d37fd 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -2187,6 +2187,13 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id)
                 dev_err(&adev->dev, "could not retrieve SSP/SPI bus clock\n");
                 goto err_no_clk;
         }
+
+        status = clk_prepare(pl022->clk);
+        if (status) {
+                dev_err(&adev->dev, "could not prepare SSP/SPI bus clock\n");
+                goto  err_clk_prep;
+        }
+
         /* Disable SSP */
         writew((readw(SSP_CR1(pl022->virtbase)) & (~SSP_CR1_MASK_SSE)),
                SSP_CR1(pl022->virtbase));
@@ -2238,6 +2245,8 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id)
         pl022_dma_remove(pl022);
         free_irq(adev->irq[0], pl022);
  err_no_irq:
+        clk_unprepare(pl022->clk);
+ err_clk_prep:
         clk_put(pl022->clk);
  err_no_clk:
         iounmap(pl022->virtbase);
@@ -2271,6 +2280,7 @@ pl022_remove(struct amba_device *adev)
         pl022_dma_remove(pl022);
         free_irq(adev->irq[0], pl022);
         clk_disable(pl022->clk);
+        clk_unprepare(pl022->clk);
         clk_put(pl022->clk);
         iounmap(pl022->virtbase);
         amba_release_regions(adev);