mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge
Signed-off-by: Guennadi Liakhovetski <[email protected]> Acked-by: Mauro Carvalho Chehab <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
This commit is contained in:
parent
ecb6fd5299
commit
a79aebfca1
1 changed files with 2 additions and 2 deletions
|
|
@ -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)
|
||||
|
|
@ -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",
|
||||
|
|
|
|||
Loading…
Reference in a new issue