Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] cx25821: Use kmemdup rather than duplicating its implementation

Browse source 
The semantic patch that makes this change is available
in scripts/coccinelle/api/memdup.cocci.

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Thomas Meyer 2011-11-17 19:12:18 -03:00 committed by Mauro Carvalho Chehab
parent 82c80f8371
commit 0ceaec188e
3 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/media/video/cx25821/cx25821-audio-upstream.c
View file

@ -733,25 +733,22 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
if (dev->input_audiofilename) {
str_length = strlen(dev->input_audiofilename);
dev->_audiofilename = kmalloc(str_length + 1, GFP_KERNEL);
dev->_audiofilename = kmemdup(dev->input_audiofilename,
str_length + 1, GFP_KERNEL);
if (!dev->_audiofilename)
goto error;
memcpy(dev->_audiofilename, dev->input_audiofilename,
str_length + 1);
/* Default if filename is empty string */
if (strcmp(dev->input_audiofilename, "") == 0)
dev->_audiofilename = "/root/audioGOOD.wav";
} else {
str_length = strlen(_defaultAudioName);
dev->_audiofilename = kmalloc(str_length + 1, GFP_KERNEL);
dev->_audiofilename = kmemdup(_defaultAudioName,
str_length + 1, GFP_KERNEL);
if (!dev->_audiofilename)
goto error;
memcpy(dev->_audiofilename, _defaultAudioName, str_length + 1);
}
retval = cx25821_sram_channel_setup_upstream_audio(dev, sram_ch,

12
drivers/media/video/cx25821/cx25821-video-upstream-ch2.c
View file

@ -747,22 +747,18 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
if (dev->input_filename_ch2) {
str_length = strlen(dev->input_filename_ch2);
dev->_filename_ch2 = kmalloc(str_length + 1, GFP_KERNEL);
dev->_filename_ch2 = kmemdup(dev->input_filename_ch2,
str_length + 1, GFP_KERNEL);
if (!dev->_filename_ch2)
goto error;
memcpy(dev->_filename_ch2, dev->input_filename_ch2,
str_length + 1);
} else {
str_length = strlen(dev->_defaultname_ch2);
dev->_filename_ch2 = kmalloc(str_length + 1, GFP_KERNEL);
dev->_filename_ch2 = kmemdup(dev->_defaultname_ch2,
str_length + 1, GFP_KERNEL);
if (!dev->_filename_ch2)
goto error;
memcpy(dev->_filename_ch2, dev->_defaultname_ch2,
str_length + 1);
}
/* Default if filename is empty string */

10
drivers/media/video/cx25821/cx25821-video-upstream.c
View file

@ -794,20 +794,18 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,
if (dev->input_filename) {
str_length = strlen(dev->input_filename);
dev->_filename = kmalloc(str_length + 1, GFP_KERNEL);
dev->_filename = kmemdup(dev->input_filename, str_length + 1,
GFP_KERNEL);
if (!dev->_filename)
goto error;
memcpy(dev->_filename, dev->input_filename, str_length + 1);
} else {
str_length = strlen(dev->_defaultname);
dev->_filename = kmalloc(str_length + 1, GFP_KERNEL);
dev->_filename = kmemdup(dev->_defaultname, str_length + 1,
GFP_KERNEL);
if (!dev->_filename)
goto error;
memcpy(dev->_filename, dev->_defaultname, str_length + 1);
}
/* Default if filename is empty string */