]> git.baikalelectronics.ru Git - kernel.git/commit
[media] cx25821: Cleanup filename assignment code
authorPeter Senna Tschudin <peter.senna@gmail.com>
Mon, 17 Sep 2012 07:04:58 +0000 (04:04 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 18 Mar 2013 23:37:09 +0000 (20:37 -0300)
commit8eebc6d0a9691ebce4c1a12915ad76ebc210a39a
tree279b698e61b2d54534235c6c401ddfc755cf560f
parent2fe065bb6d0c6c85b04a80d72e2ead491eb94a57
[media] cx25821: Cleanup filename assignment code

I'm pasting the original code and my proposal on the commit message for
make it easy to compare the two versions.
Line 62 of cx25821-audio-upstream.h contains:
char *_defaultAudioName = "/root/audioGOOD.wav";
Original code after replace kmemdup for kstrdup, and after fix return error
code:
if (dev->input_audiofilename) {
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 {
dev->_audiofilename = kstrdup(_defaultAudioName,
      GFP_KERNEL);
if (!dev->_audiofilename) {
err = -ENOMEM;
goto error;
}
}
Code proposed in this patch:
if ((dev->input_audiofilename) &&
    (strcmp(dev->input_audiofilename, "") != 0))
dev->_audiofilename = kstrdup(dev->input_audiofilename,
      GFP_KERNEL);
else
dev->_audiofilename = kstrdup(_defaultAudioName,
      GFP_KERNEL);
if (!dev->_audiofilename) {
err = -ENOMEM;
goto error;
}

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/pci/cx25821/cx25821-audio-upstream.c