diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-24 11:27:06 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-08 12:50:22 -0500 |
| commit | 6c5dbb40f4795f3fdbf3e5aab7eda4e2f838d08b (patch) | |
| tree | c63888f76d8b06749970ab328d088d3887b64c16 /drivers | |
| parent | eeec7c8d18465a85c212230bdb715e3f029dbf4e (diff) | |
[ARM] omap: omap24xxcam: use short connection IDs for omap2 clocks
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/omap24xxcam.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c index 73eb656acfe3..805faaea6449 100644 --- a/drivers/media/video/omap24xxcam.c +++ b/drivers/media/video/omap24xxcam.c | |||
| @@ -80,17 +80,17 @@ static int omap24xxcam_clock_get(struct omap24xxcam_device *cam) | |||
| 80 | { | 80 | { |
| 81 | int rval = 0; | 81 | int rval = 0; |
| 82 | 82 | ||
| 83 | cam->fck = clk_get(cam->dev, "cam_fck"); | 83 | cam->fck = clk_get(cam->dev, "fck"); |
| 84 | if (IS_ERR(cam->fck)) { | 84 | if (IS_ERR(cam->fck)) { |
| 85 | dev_err(cam->dev, "can't get cam_fck"); | 85 | dev_err(cam->dev, "can't get camera fck"); |
| 86 | rval = PTR_ERR(cam->fck); | 86 | rval = PTR_ERR(cam->fck); |
| 87 | omap24xxcam_clock_put(cam); | 87 | omap24xxcam_clock_put(cam); |
| 88 | return rval; | 88 | return rval; |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | cam->ick = clk_get(cam->dev, "cam_ick"); | 91 | cam->ick = clk_get(cam->dev, "ick"); |
| 92 | if (IS_ERR(cam->ick)) { | 92 | if (IS_ERR(cam->ick)) { |
| 93 | dev_err(cam->dev, "can't get cam_ick"); | 93 | dev_err(cam->dev, "can't get camera ick"); |
| 94 | rval = PTR_ERR(cam->ick); | 94 | rval = PTR_ERR(cam->ick); |
| 95 | omap24xxcam_clock_put(cam); | 95 | omap24xxcam_clock_put(cam); |
| 96 | } | 96 | } |
