diff --git a/[refs] b/[refs] index 573b878a5678..84b9bf47e488 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f4cf676728e186b53ba1bb60c442c0f503ffdbc +refs/heads/master: 4a8cfe6a5c158133f57c2e8476f259366d4bdc4d diff --git a/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c b/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c index a6502af0771e..366194068e92 100644 --- a/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c +++ b/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c @@ -87,7 +87,6 @@ static int snd_cx18_pcm_capture_open(struct snd_pcm_substream *substream) /* Allocate memory */ item = kmalloc(sizeof(struct cx18_open_id), GFP_KERNEL); if (NULL == item) { - CX18_DEBUG_WARN("nomem on v4l2 open\n"); return -ENOMEM; } item->cx = cx;