Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/net/can/spi/mcp251x.c
Simple merge

diff --cc drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
index 5bfba5b,daa2b96..134b2e7
--- 1/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
--- 2/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
@@@ -253,23 -240,9 +253,25 @@@ static void buffer_work_cb(struct work_
  {
        struct mmal_msg_context *msg_context =
                container_of(work, struct mmal_msg_context, u.bulk.work);
 +      struct mmal_buffer *buffer = msg_context->u.bulk.buffer;
 +
 +      if (!buffer) {
 +              pr_err("%s: ctx: %p, No mmal buffer to pass details\n",
 +                     __func__, msg_context);
 +              return;
 +      }
 +
 +      buffer->length = msg_context->u.bulk.buffer_used;
 +      buffer->mmal_flags = msg_context->u.bulk.mmal_flags;
 +      buffer->dts = msg_context->u.bulk.dts;
 +      buffer->pts = msg_context->u.bulk.pts;
 +      buffer->cmd = msg_context->u.bulk.cmd;
 +
 +      if (!buffer->cmd)
 +              atomic_dec(&msg_context->u.bulk.port->buffers_with_vpu);
  
+       atomic_dec(&msg_context->u.bulk.port->buffers_with_vpu);
+ 
        msg_context->u.bulk.port->buffer_cb(msg_context->u.bulk.instance,
                                            msg_context->u.bulk.port,
                                            msg_context->u.bulk.status,
@@@ -408,11 -380,9 +410,13 @@@ buffer_from_host(struct vchiq_mmal_inst
  
        /* initialise work structure ready to schedule callback */
        INIT_WORK(&msg_context->u.bulk.work, buffer_work_cb);
 +      INIT_WORK(&msg_context->u.bulk.buffer_to_host_work,
 +                buffer_to_host_work_cb);
 +
 +      atomic_inc(&port->buffers_with_vpu);
  
+       atomic_inc(&port->buffers_with_vpu);
+ 
        /* prep the buffer from host message */
        memset(&m, 0xbc, sizeof(m));    /* just to make debug clearer */