From 74bd6cefd3ecacaab8c3ded2dfd7dbc93ecdbe7e Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Mon, 17 Sep 2012 04:04:58 -0300 Subject: [PATCH] --- yaml --- r: 366555 b: refs/heads/master c: cab3e1ffbe1b9c7a607506338f590dc1e6ca9909 h: refs/heads/master i: 366553: 01b01be468682483b2f912ba2651ff1cd2bf82b7 366551: 1a3c7fad476764f2581611d047994c6a310b1246 v: v3 --- [refs] | 2 +- .../pci/cx25821/cx25821-audio-upstream.c | 21 ++++++------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 79df4ed512e8..9177bd4281a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52dee392f491e166cef21c787d1736f052a902cd +refs/heads/master: cab3e1ffbe1b9c7a607506338f590dc1e6ca9909 diff --git a/trunk/drivers/media/pci/cx25821/cx25821-audio-upstream.c b/trunk/drivers/media/pci/cx25821/cx25821-audio-upstream.c index 87491ca05ee5..ea973202a66c 100644 --- a/trunk/drivers/media/pci/cx25821/cx25821-audio-upstream.c +++ b/trunk/drivers/media/pci/cx25821/cx25821-audio-upstream.c @@ -728,26 +728,17 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) dev->_audio_lines_count = LINES_PER_AUDIO_BUFFER; _line_size = AUDIO_LINE_SIZE; - if (dev->input_audiofilename) { + if ((dev->input_audiofilename) && + (strcmp(dev->input_audiofilename, "") != 0)) dev->_audiofilename = kstrdup(dev->input_audiofilename, GFP_KERNEL); - - if (!dev->_audiofilename) { - err = -ENOMEM; - goto error; - } - - /* Default if filename is empty string */ - if (strcmp(dev->input_audiofilename, "") == 0) - dev->_audiofilename = "/root/audioGOOD.wav"; - } else { + else dev->_audiofilename = kstrdup(_defaultAudioName, GFP_KERNEL); - if (!dev->_audiofilename) { - err = -ENOMEM; - goto error; - } + if (!dev->_audiofilename) { + err = -ENOMEM; + goto error; } cx25821_sram_channel_setup_upstream_audio(dev, sram_ch,