Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 166329
b: refs/heads/master
c: a79aebf
h: refs/heads/master
i:
  166327: a37c856
v: v3
  • Loading branch information
Guennadi Liakhovetski authored and Paul Mundt committed Sep 25, 2009
1 parent 5ad2e33 commit af1b7d8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ecb6fd529942c143c8837dfb11262009c77e9c77
refs/heads/master: a79aebfca1e597c1aab4b8e327028f96f5ea9095
4 changes: 2 additions & 2 deletions trunk/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 af1b7d8

Please sign in to comment.