diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-18 07:38:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-18 07:38:19 -0800 |
| commit | 5cbb0601bfddfc55d6ea409651313c13e3d6e90a (patch) | |
| tree | bf1216e41d30f1c2d8eea631945ef8efeb74ad56 /drivers | |
| parent | 2d5bc23b32e0ec6fe9c1cdd9f371063881dc1ffc (diff) | |
| parent | 648f15345add88a7eea724365fe1217a8d8a1e16 (diff) | |
| download | linux-5cbb0601bfddfc55d6ea409651313c13e3d6e90a.tar.bz2 | |
Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fixup last users of irq_chip->typename
uio: pm_runtime_disable is needed if failed
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/uio/uio_pdrv_genirq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c index 02347c57357d..aa53db9f2e88 100644 --- a/drivers/uio/uio_pdrv_genirq.c +++ b/drivers/uio/uio_pdrv_genirq.c @@ -178,6 +178,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev) return 0; bad1: kfree(priv); + pm_runtime_disable(&pdev->dev); bad0: return ret; } |