Skip to content

Commit

Permalink
sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge
Browse files Browse the repository at this point in the history
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Guennadi Liakhovetski authored and Paul Mundt committed Sep 25, 2009
1 parent ecb6fd5 commit a79aebf
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/media/video/sh_mobile_ceu_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd)
"SuperH Mobile CEU driver attached to camera %d\n",
icd->devnum);

clk_enable(pcdev->clk);
pm_runtime_get_sync(ici->v4l2_dev.dev);

ceu_write(pcdev, CAPSR, 1 << 16); /* reset */
while (ceu_read(pcdev, CSTSR) & 1)
Expand Down Expand Up @@ -438,7 +438,7 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd)
}
spin_unlock_irqrestore(&pcdev->lock, flags);

clk_disable(pcdev->clk);
pm_runtime_put_sync(ici->v4l2_dev.dev);

dev_info(icd->dev.parent,
"SuperH Mobile CEU driver detached from camera %d\n",
Expand Down

0 comments on commit a79aebf

Please sign in to comment.