diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-09-23 10:21:53 +0200 |
|---|---|---|
| committer | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-09-23 10:21:53 +0200 |
| commit | 39069894d1e753fe3c7d75f3f68a0a77feecb601 (patch) | |
| tree | fe61c2e807774746fd466237a7339a7439d9dc7a | |
| parent | b73b7d2d551130230ce28e6ac9ab3aa7312416de (diff) | |
| download | mediapointer-dvb-s2-39069894d1e753fe3c7d75f3f68a0a77feecb601.tar.gz mediapointer-dvb-s2-39069894d1e753fe3c7d75f3f68a0a77feecb601.tar.bz2 | |
sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
| -rw-r--r-- | linux/drivers/media/video/sh_mobile_ceu_camera.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/sh_mobile_ceu_camera.c b/linux/drivers/media/video/sh_mobile_ceu_camera.c index 7e78202c0..cd6dc7587 100644 --- a/linux/drivers/media/video/sh_mobile_ceu_camera.c +++ b/linux/drivers/media/video/sh_mobile_ceu_camera.c @@ -405,7 +405,7 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd) "SuperH Mobile CEU driver attached to camera %d\n", icd->devnum); - pm_runtime_get_sync(ici->dev); + pm_runtime_get_sync(ici->v4l2_dev.dev); ceu_write(pcdev, CAPSR, 1 << 16); /* reset */ while (ceu_read(pcdev, CSTSR) & 1) @@ -439,7 +439,7 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd) } spin_unlock_irqrestore(&pcdev->lock, flags); - pm_runtime_put_sync(ici->dev); + pm_runtime_put_sync(ici->v4l2_dev.dev); dev_info(icd->dev.parent, "SuperH Mobile CEU driver detached from camera %d\n", |