Merge staging-next tree into Linus's latest version

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

diff --git a/drivers/staging/cx25821/cx25821-video-upstream.c b/drivers/staging/cx25821/cx25821-video-upstream.c
index c842d8f3d692fbb47810b5311a299df148500b85..7a3dad91eba8f423c5663f7a618df452188101cf 100644 (file)
--- a/drivers/staging/cx25821/cx25821-video-upstream.c
+++ b/drivers/staging/cx25821/cx25821-video-upstream.c
@@ -830,7 +830,7 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,
 
        if (dev->input_filename) {
                str_length = strlen(dev->input_filename);
-               dev->_filename = (char *)kmalloc(str_length + 1, GFP_KERNEL);
+               dev->_filename = kmalloc(str_length + 1, GFP_KERNEL);
 
                if (!dev->_filename)
                        goto error;
@@ -838,7 +838,7 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,
                memcpy(dev->_filename, dev->input_filename, str_length + 1);
        } else {
                str_length = strlen(dev->_defaultname);
-               dev->_filename = (char *)kmalloc(str_length + 1, GFP_KERNEL);
+               dev->_filename = kmalloc(str_length + 1, GFP_KERNEL);
 
                if (!dev->_filename)
                        goto error;