From efa762f597cb6ec094a9e62acd4f1167b3199d34 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 10 Oct 2011 11:09:53 -0300 Subject: [media] cx23885: minor function renaming to ensure uniformity Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/cx23885/cx23885-video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/media/video/cx23885/cx23885-video.c') diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 747fdb35145b..58855b2bd4e5 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c @@ -1444,7 +1444,7 @@ void cx23885_video_unregister(struct cx23885_dev *dev) } if (dev->audio_dev) - cx23885_audio_finidev(dev); + cx23885_audio_unregister(dev); } int cx23885_video_register(struct cx23885_dev *dev) @@ -1525,7 +1525,7 @@ int cx23885_video_register(struct cx23885_dev *dev) dev->name, video_device_node_name(dev->video_dev)); /* Register ALSA audio device */ - dev->audio_dev = cx23885_audio_initdev(dev); + dev->audio_dev = cx23885_audio_register(dev); /* initial device configuration */ mutex_lock(&dev->lock); -- cgit v1.2.3