From 4490975ac7b225355b715a574febe4340d6f35ae Mon Sep 17 00:00:00 2001 From: Shubhrajyoti D Date: Fri, 28 Oct 2011 17:14:18 +0530 Subject: [PATCH] --- yaml --- r: 280121 b: refs/heads/master c: 751c925cbb3a270f9771e3945494cb44bd9e732a h: refs/heads/master i: 280119: a94ba2f76d883c0be5333a1f38d8a78f307202b1 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-omap2-mcspi.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 07eb3c7c8da0..b45c291fc698 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2856ac13b8ab41a17b1c65e4eed51543e55f4bac +refs/heads/master: 751c925cbb3a270f9771e3945494cb44bd9e732a diff --git a/trunk/drivers/spi/spi-omap2-mcspi.c b/trunk/drivers/spi/spi-omap2-mcspi.c index 0192d1b79ca7..22e17264a20e 100644 --- a/trunk/drivers/spi/spi-omap2-mcspi.c +++ b/trunk/drivers/spi/spi-omap2-mcspi.c @@ -1196,6 +1196,7 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) err4: spi_master_put(master); err3: + pm_runtime_disable(&pdev->dev); kfree(mcspi->dma_channels); err2: release_mem_region(r->start, resource_size(r)); @@ -1217,6 +1218,7 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev) dma_channels = mcspi->dma_channels; omap2_mcspi_disable_clocks(mcspi); + pm_runtime_disable(&pdev->dev); r = platform_get_resource(pdev, IORESOURCE_MEM, 0); release_mem_region(r->start, resource_size(r));