Merge staging-next tree into Linus's latest version

[linux-drm-fsl-dcu.git] / drivers / staging / cx25821 / cx25821-audio-upstream.c

diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/staging/cx25821/cx25821-audio-upstream.c
index 6a4e8720b478c034c9848964aab567a0cbaae554..eb39d13f7d75afe40a20610f9ae152770a71137b 100644 (file)
--- a/drivers/staging/cx25821/cx25821-audio-upstream.c
+++ b/drivers/staging/cx25821/cx25821-audio-upstream.c
@@ -753,8 +753,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
 
        if (dev->input_audiofilename) {
                str_length = strlen(dev->input_audiofilename);
-               dev->_audiofilename =
-                   (char *)kmalloc(str_length + 1, GFP_KERNEL);
+               dev->_audiofilename = kmalloc(str_length + 1, GFP_KERNEL);
 
                if (!dev->_audiofilename)
                        goto error;
@@ -768,8 +767,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
                }
        } else {
                str_length = strlen(_defaultAudioName);
-               dev->_audiofilename =
-                   (char *)kmalloc(str_length + 1, GFP_KERNEL);
+               dev->_audiofilename = kmalloc(str_length + 1, GFP_KERNEL);
 
                if (!dev->_audiofilename)
                        goto error;