diff options
author | Steven Toth <stoth@kernellabs.com> | 2011-10-10 10:09:53 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-10-14 16:03:30 -0400 |
commit | efa762f597cb6ec094a9e62acd4f1167b3199d34 (patch) | |
tree | 4f97c84d23508083de1196e71ca4d36b02100c77 /drivers/media/video/cx23885/cx23885-video.c | |
parent | 80f1e086e68f4e6ef066022d8b7f5ea0bd686220 (diff) |
[media] cx23885: minor function renaming to ensure uniformity
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-video.c')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-video.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
1444 | } | 1444 | } |
1445 | 1445 | ||
1446 | if (dev->audio_dev) | 1446 | if (dev->audio_dev) |
1447 | cx23885_audio_finidev(dev); | 1447 | cx23885_audio_unregister(dev); |
1448 | } | 1448 | } |
1449 | 1449 | ||
1450 | int cx23885_video_register(struct cx23885_dev *dev) | 1450 | int cx23885_video_register(struct cx23885_dev *dev) |
@@ -1525,7 +1525,7 @@ int cx23885_video_register(struct cx23885_dev *dev) | |||
1525 | dev->name, video_device_node_name(dev->video_dev)); | 1525 | dev->name, video_device_node_name(dev->video_dev)); |
1526 | 1526 | ||
1527 | /* Register ALSA audio device */ | 1527 | /* Register ALSA audio device */ |
1528 | dev->audio_dev = cx23885_audio_initdev(dev); | 1528 | dev->audio_dev = cx23885_audio_register(dev); |
1529 | 1529 | ||
1530 | /* initial device configuration */ | 1530 | /* initial device configuration */ |
1531 | mutex_lock(&dev->lock); | 1531 | mutex_lock(&dev->lock); |