Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ceaec18 authored by Thomas Meyer's avatar Thomas Meyer Committed by Mauro Carvalho Chehab
Browse files

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



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

Signed-off-by: default avatarThomas Meyer <thomas@m3y3r.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 82c80f83

drivers/media/video/cx25821/cx25821-audio-upstream.c

+4 −7
Original line number Diff line number Diff line
@@ -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,

drivers/media/video/cx25821/cx25821-video-upstream-ch2.c

+4 −8
Original line number Diff line number Diff line
@@ -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 */

drivers/media/video/cx25821/cx25821-video-upstream.c

+4 −6
Original line number Diff line number Diff line
@@ -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 */