summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-14 10:20:36 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-14 10:20:36 -0300
commitd5193c5902aab5c738cd11481b408771c9050d8b (patch)
tree082888cbe80c3775508ed3d5e96a0fb15999f952 /linux/drivers/media/video
parent28aee8b0e7428e7263d4e53a32677676413fc622 (diff)
downloadmediapointer-dvb-s2-d5193c5902aab5c738cd11481b408771c9050d8b.tar.gz
mediapointer-dvb-s2-d5193c5902aab5c738cd11481b408771c9050d8b.tar.bz2
backport a few language cleanups
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/omap24xxcam.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/omap24xxcam.c b/linux/drivers/media/video/omap24xxcam.c
index d828597ba..5fc4ac0d8 100644
--- a/linux/drivers/media/video/omap24xxcam.c
+++ b/linux/drivers/media/video/omap24xxcam.c
@@ -80,17 +80,17 @@ static int omap24xxcam_clock_get(struct omap24xxcam_device *cam)
{
int rval = 0;
- cam->fck = clk_get(cam->dev, "cam_fck");
+ cam->fck = clk_get(cam->dev, "fck");
if (IS_ERR(cam->fck)) {
- dev_err(cam->dev, "can't get cam_fck");
+ dev_err(cam->dev, "can't get camera fck");
rval = PTR_ERR(cam->fck);
omap24xxcam_clock_put(cam);
return rval;
}
- cam->ick = clk_get(cam->dev, "cam_ick");
+ cam->ick = clk_get(cam->dev, "ick");
if (IS_ERR(cam->ick)) {
- dev_err(cam->dev, "can't get cam_ick");
+ dev_err(cam->dev, "can't get camera ick");
rval = PTR_ERR(cam->ick);
omap24xxcam_clock_put(cam);
}