From 7aa1a55f629c9a506eda4e02e945281c5ad4da4c Mon Sep 17 00:00:00 2001 From: Michel JAOUEN Date: Fri, 17 Aug 2012 17:28:41 +0200 Subject: [PATCH] --- yaml --- r: 321861 b: refs/heads/master c: 6887237cd7da904184dab2750504040c68f3a080 h: refs/heads/master i: 321859: 5a442047af9536460badcbd9d087a6b269bb7a43 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-pl022.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 31281b4e3ca4..bc85e9a8f538 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f68237865b2f55badbb3f73792d573899a62475 +refs/heads/master: 6887237cd7da904184dab2750504040c68f3a080 diff --git a/trunk/drivers/spi/spi-pl022.c b/trunk/drivers/spi/spi-pl022.c index aab518ec2bbc..6abbe23c39b4 100644 --- a/trunk/drivers/spi/spi-pl022.c +++ b/trunk/drivers/spi/spi-pl022.c @@ -2053,7 +2053,6 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id) printk(KERN_INFO "pl022: mapped registers from 0x%08x to %p\n", adev->res.start, pl022->virtbase); - pm_runtime_enable(dev); pm_runtime_resume(dev); pl022->clk = clk_get(&adev->dev, NULL);