From 269cd4f26fa93f0c7bfab821993cca82acf0d410 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Mon, 17 Jan 2011 17:01:07 +0100 Subject: [PATCH] --- yaml --- r: 231727 b: refs/heads/master c: d95defaca7994ffff1ceb52f3011eb644dfe3274 h: refs/heads/master i: 231725: cabe6708ac96bf3a785e14a802f8ac6b1a959717 231723: 877595c1f1332023e01b168116bd5cfd98b7249d 231719: 1ff8d0cbc3b0b4be1913dc5fca236ced16e5099f 231711: 7036d5e4f22e253eb0c2fd1f26abb889320b7572 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi_sh_msiof.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index af8844497d01..d40b3e6cee93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 672c54466d24994eb9633f993862c89539504a42 +refs/heads/master: d95defaca7994ffff1ceb52f3011eb644dfe3274 diff --git a/trunk/drivers/spi/spi_sh_msiof.c b/trunk/drivers/spi/spi_sh_msiof.c index d93b66743ba7..56f60c8ea0ab 100644 --- a/trunk/drivers/spi/spi_sh_msiof.c +++ b/trunk/drivers/spi/spi_sh_msiof.c @@ -635,7 +635,7 @@ static int sh_msiof_spi_remove(struct platform_device *pdev) ret = spi_bitbang_stop(&p->bitbang); if (!ret) { pm_runtime_disable(&pdev->dev); - free_irq(platform_get_irq(pdev, 0), sh_msiof_spi_irq); + free_irq(platform_get_irq(pdev, 0), p); iounmap(p->mapbase); clk_put(p->clk); spi_master_put(p->bitbang.master);