Skip to content

Commit

Permalink
[media] cx25821: Replace kmemdup for kstrdup and clean up
Browse files Browse the repository at this point in the history
Replace kmemdup for kstrdup and cleanup related code.

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Peter Senna Tschudin authored and Mauro Carvalho Chehab committed Nov 22, 2012
1 parent c81d497 commit 6c17c24
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/media/pci/cx25821/cx25821-audio-upstream.c
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,6 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
{
struct sram_channel *sram_ch;
int err = 0;
int str_length = 0;

if (dev->_audio_is_running) {
pr_warn("Audio Channel is still running so return!\n");
Expand Down Expand Up @@ -730,9 +729,8 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
_line_size = AUDIO_LINE_SIZE;

if (dev->input_audiofilename) {
str_length = strlen(dev->input_audiofilename);
dev->_audiofilename = kmemdup(dev->input_audiofilename,
str_length + 1, GFP_KERNEL);
dev->_audiofilename = kstrdup(dev->input_audiofilename,
GFP_KERNEL);

if (!dev->_audiofilename) {
err = -ENOMEM;
Expand All @@ -743,9 +741,8 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
if (strcmp(dev->input_audiofilename, "") == 0)
dev->_audiofilename = "/root/audioGOOD.wav";
} else {
str_length = strlen(_defaultAudioName);
dev->_audiofilename = kmemdup(_defaultAudioName,
str_length + 1, GFP_KERNEL);
dev->_audiofilename = kstrdup(_defaultAudioName,
GFP_KERNEL);

if (!dev->_audiofilename) {
err = -ENOMEM;
Expand Down

0 comments on commit 6c17c24

Please sign in to comment.