aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@kernellabs.com>2009-11-22 21:42:33 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:10:44 -0500
commit485e319adef5d33a1dca4320cb26fb387b4a9381 (patch)
tree7c177d1787715ae0457bd3aef5bb472dd4f0cdc2 /drivers/media/video/cx18
parent5eb9978f47ec09ce7ab5b9cc86d7b5d6ebb28a9d (diff)
V4L/DVB: cx18-alsa: remove a couple of warnings
Remove a couple of warnings from dead code during driver development. Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18')
-rw-r--r--drivers/media/video/cx18/cx18-alsa-main.c1
-rw-r--r--drivers/media/video/cx18/cx18-alsa-pcm.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/cx18-alsa-main.c b/drivers/media/video/cx18/cx18-alsa-main.c
index 9b652a1649c8..2b72f42e8461 100644
--- a/drivers/media/video/cx18/cx18-alsa-main.c
+++ b/drivers/media/video/cx18/cx18-alsa-main.c
@@ -255,7 +255,6 @@ static int cx18_alsa_exit_callback(struct device *dev, void *data)
255{ 255{
256 struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); 256 struct v4l2_device *v4l2_dev = dev_get_drvdata(dev);
257 struct snd_cx18_card *cxsc; 257 struct snd_cx18_card *cxsc;
258 struct cx18 *cx;
259 258
260 if (v4l2_dev == NULL) { 259 if (v4l2_dev == NULL) {
261 printk(KERN_ERR "cx18-alsa: %s: struct v4l2_device * is NULL\n", 260 printk(KERN_ERR "cx18-alsa: %s: struct v4l2_device * is NULL\n",
diff --git a/drivers/media/video/cx18/cx18-alsa-pcm.c b/drivers/media/video/cx18/cx18-alsa-pcm.c
index ec5851c7855d..05cb8f1753b5 100644
--- a/drivers/media/video/cx18/cx18-alsa-pcm.c
+++ b/drivers/media/video/cx18/cx18-alsa-pcm.c
@@ -75,7 +75,6 @@ static int snd_cx18_pcm_capture_open(struct snd_pcm_substream *substream)
75 struct snd_cx18_card *cxsc = snd_pcm_substream_chip(substream); 75 struct snd_cx18_card *cxsc = snd_pcm_substream_chip(substream);
76 struct snd_pcm_runtime *runtime = substream->runtime; 76 struct snd_pcm_runtime *runtime = substream->runtime;
77 struct v4l2_device *v4l2_dev = cxsc->v4l2_dev; 77 struct v4l2_device *v4l2_dev = cxsc->v4l2_dev;
78 struct snd_card *sc = cxsc->sc;
79 struct cx18 *cx = to_cx18(v4l2_dev); 78 struct cx18 *cx = to_cx18(v4l2_dev);
80 struct cx18_stream *s; 79 struct cx18_stream *s;
81 struct cx18_open_id *item; 80 struct cx18_open_id *item;