mirror of https://gitee.com/openkylin/linux.git
cab3e1ffbe
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>
|
||
|---|---|---|
| .. | ||
| b2c2 | ||
| bt8xx | ||
| cx18 | ||
| cx88 | ||
| cx23885 | ||
| cx25821 | ||
| ddbridge | ||
| dm1105 | ||
| ivtv | ||
| mantis | ||
| meye | ||
| ngene | ||
| pluto2 | ||
| pt1 | ||
| saa7134 | ||
| saa7146 | ||
| saa7164 | ||
| sta2x11 | ||
| ttpci | ||
| zoran | ||
| Kconfig | ||
| Makefile | ||