Merge tag 'media/v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab: "Core fixes: - cec: Respond to unregistered initiators, when applicable - dvb_frontend: only use kref after initialized Driver-specific fixes: - qcom, camss: Make function vfe_set_selection static - qcom: VIDEO_QCOM_CAMSS should depend on HAS_DMA - s5p-cec: add NACK detection support - media: staging/imx: Fix uninitialized variable warning - dib3000mc: i2c transfers over usb cannot be done from stack - venus: init registered list on streamoff" * tag 'media/v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: media: dvb_frontend: only use kref after initialized media: platform: VIDEO_QCOM_CAMSS should depend on HAS_DMA media: cec: Respond to unregistered initiators, when applicable media: s5p-cec: add NACK detection support media: staging/imx: Fix uninitialized variable warning media: qcom: camss: Make function vfe_set_selection static media: venus: init registered list on streamoff media: dvb: i2c transfers over usb cannot be done from stack
这个提交包含在:
@@ -1797,12 +1797,19 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg,
|
||||
*/
|
||||
switch (msg->msg[1]) {
|
||||
case CEC_MSG_GET_CEC_VERSION:
|
||||
case CEC_MSG_GIVE_DEVICE_VENDOR_ID:
|
||||
case CEC_MSG_ABORT:
|
||||
case CEC_MSG_GIVE_DEVICE_POWER_STATUS:
|
||||
case CEC_MSG_GIVE_PHYSICAL_ADDR:
|
||||
case CEC_MSG_GIVE_OSD_NAME:
|
||||
/*
|
||||
* These messages reply with a directed message, so ignore if
|
||||
* the initiator is Unregistered.
|
||||
*/
|
||||
if (!adap->passthrough && from_unregistered)
|
||||
return 0;
|
||||
/* Fall through */
|
||||
case CEC_MSG_GIVE_DEVICE_VENDOR_ID:
|
||||
case CEC_MSG_GIVE_FEATURES:
|
||||
case CEC_MSG_GIVE_PHYSICAL_ADDR:
|
||||
/*
|
||||
* Skip processing these messages if the passthrough mode
|
||||
* is on.
|
||||
@@ -1810,7 +1817,7 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg,
|
||||
if (adap->passthrough)
|
||||
goto skip_processing;
|
||||
/* Ignore if addressing is wrong */
|
||||
if (is_broadcast || from_unregistered)
|
||||
if (is_broadcast)
|
||||
return 0;
|
||||
break;
|
||||
|
||||
|
在新工单中引用
屏蔽一个用户