This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/media_tree.git tree:

Subject: [media] cx25821: Replace kmemdup for kstrdup and clean up
Author:  Peter Senna Tschudin <[email protected]>
Date:    Mon Sep 17 04:04:57 2012 -0300

Replace kmemdup for kstrdup and cleanup related code.

Signed-off-by: Peter Senna Tschudin <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 drivers/media/pci/cx25821/cx25821-audio-upstream.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

---

http://git.linuxtv.org/media_tree.git?a=commitdiff;h=6c17c24d384ce69893e191c94b500c97bd263c27

diff --git a/drivers/media/pci/cx25821/cx25821-audio-upstream.c 
b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
index 42ad84a..87491ca 100644
--- a/drivers/media/pci/cx25821/cx25821-audio-upstream.c
+++ b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
@@ -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");
@@ -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;
@@ -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;

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to