Merge tag 'media/v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - new CEC pin injection code for testing purposes

 - DVB frontend cxd2099 promoted from staging

 - new platform driver for Sony cxd2880 DVB devices

 - new sensor drivers: mt9t112, ov2685, ov5695, ov772x, tda1997x,
   tw9910.c

 - removal of unused cx18 and ivtv alsa mixers

 - the reneseas-ceu driver doesn't depend on soc_camera anymore and
   moved from staging

 - removed the mantis_vp3028 driver, unused since 2009

 - s5p-mfc: add support for version 10 of the MSP

 - added a decoder for imon protocol

 - atomisp: lots of cleanups

 - imx074 and mt9t031: don't depend on soc_camera anymore, being
   promoted from staging

 - added helper functions to better support DVB I2C binding

 - lots of driver improvements and cleanups

* tag 'media/v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (438 commits)
  media: v4l2-ioctl: rename a temp var that stores _IOC_SIZE(cmd)
  media: fimc-capture: get rid of two warnings
  media: dvb-usb-v2: fix a missing dependency of I2C_MUX
  media: uvc: to the right check at uvc_ioctl_enum_framesizes()
  media: cec-core: fix a bug at cec_error_inj_write()
  media: tda9840: cleanup a warning
  media: tm6000:  avoid casting just to print pointer address
  media: em28xx-input: improve error handling code
  media: zr364xx: avoid casting just to print pointer address
  media: vivid-radio-rx: add a cast to avoid a warning
  media: saa7134-alsa: don't use casts to print a buffer address
  media: solo6x10: get rid of an address space warning
  media: zoran: don't cast pointers to print them
  media: ir-kbd-i2c: change the if logic to avoid a warning
  media: ir-kbd-i2c: improve error handling code
  media: saa7134-input: improve error handling
  media: s2255drv: fix a casting warning
  media: ivtvfb: Cleanup some warnings
  media: videobuf-dma-sg: Fix a weird cast
  soc_camera: fix a weird cast on printk
  ...

1 files changed, 22 insertions, 11 deletions

diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c
index c5c827e11b64..b5dcc6d1fe90 100644
--- a/drivers/media/common/siano/smscoreapi.c
+++ b/drivers/media/common/siano/smscoreapi.c
@@ -631,7 +631,8 @@ smscore_buffer_t *smscore_createbuffer(u8 *buffer, void *common_buffer,
 
         cb->p = buffer;
         cb->offset_in_common = buffer - (u8 *) common_buffer;
-        cb->phys = common_buffer_phys + cb->offset_in_common;
+        if (common_buffer_phys)
+                cb->phys = common_buffer_phys + cb->offset_in_common;
 
         return cb;
 }
@@ -690,17 +691,21 @@ int smscore_register_device(struct smsdevice_params_t *params,
 
         /* alloc common buffer */
         dev->common_buffer_size = params->buffer_size * params->num_buffers;
-        dev->common_buffer = dma_alloc_coherent(NULL, dev->common_buffer_size,
-                                                &dev->common_buffer_phys,
-                                                GFP_KERNEL | GFP_DMA);
-        if (!dev->common_buffer) {
+        if (params->usb_device)
+                buffer = kzalloc(dev->common_buffer_size, GFP_KERNEL);
+        else
+                buffer = dma_alloc_coherent(params->device,
+                                            dev->common_buffer_size,
+                                            &dev->common_buffer_phys,
+                                            GFP_KERNEL | GFP_DMA);
+        if (!buffer) {
                 smscore_unregister_device(dev);
                 return -ENOMEM;
         }
+        dev->common_buffer = buffer;
 
         /* prepare dma buffers */
-        for (buffer = dev->common_buffer;
-             dev->num_buffers < params->num_buffers;
+        for (; dev->num_buffers < params->num_buffers;
              dev->num_buffers++, buffer += params->buffer_size) {
                 struct smscore_buffer_t *cb;
 
@@ -720,6 +725,7 @@ int smscore_register_device(struct smsdevice_params_t *params,
         dev->board_id = SMS_BOARD_UNKNOWN;
         dev->context = params->context;
         dev->device = params->device;
+        dev->usb_device = params->usb_device;
         dev->setmode_handler = params->setmode_handler;
         dev->detectmode_handler = params->detectmode_handler;
         dev->sendrequest_handler = params->sendrequest_handler;
@@ -1231,10 +1237,15 @@ void smscore_unregister_device(struct smscore_device_t *coredev)
 
         pr_debug("freed %d buffers\n", num_buffers);
 
-        if (coredev->common_buffer)
-                dma_free_coherent(NULL, coredev->common_buffer_size,
-                        coredev->common_buffer, coredev->common_buffer_phys);
-
+        if (coredev->common_buffer) {
+                if (coredev->usb_device)
+                        kfree(coredev->common_buffer);
+                else
+                        dma_free_coherent(coredev->device,
+                                          coredev->common_buffer_size,
+                                          coredev->common_buffer,
+                                          coredev->common_buffer_phys);
+        }
         kfree(coredev->fw_buf);
 
         list_del(&coredev->entry);