Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cde00d21 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media fixes from Mauro Carvalho Chehab:
 "Three fixes:

   - dvb: fix a Kconfig typo on a help text

   - tegra-cec: reset rx_buf_cnt when start bit detected

   - rc: lirc does not use LIRC_CAN_SEND_SCANCODE feature"

* tag 'media/v4.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: dvb: fix a Kconfig typo
  media: tegra-cec: reset rx_buf_cnt when start bit detected
  media: rc: lirc does not use LIRC_CAN_SEND_SCANCODE feature
parents 8ce72017 2c27476e

drivers/media/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ config DVB_MMAP 
	select VIDEOBUF2_VMALLOC

	default n

	help

	  This option enables DVB experimental memory-mapped API, with

	  This option enables DVB experimental memory-mapped API, which

	  reduces the number of context switches to read DVB buffers, as

	  the buffers can use mmap() syscalls.

drivers/media/platform/tegra-cec/tegra_cec.c

+7 −10
Original line number Diff line number Diff line
@@ -172,16 +172,13 @@ static irqreturn_t tegra_cec_irq_handler(int irq, void *data) 
		}

	}



	if (status & (TEGRA_CEC_INT_STAT_RX_REGISTER_OVERRUN |

		      TEGRA_CEC_INT_STAT_RX_BUS_ANOMALY_DETECTED |

		      TEGRA_CEC_INT_STAT_RX_START_BIT_DETECTED |

		      TEGRA_CEC_INT_STAT_RX_BUS_ERROR_DETECTED)) {

	if (status & TEGRA_CEC_INT_STAT_RX_START_BIT_DETECTED) {

		cec_write(cec, TEGRA_CEC_INT_STAT,

			  (TEGRA_CEC_INT_STAT_RX_REGISTER_OVERRUN |

			   TEGRA_CEC_INT_STAT_RX_BUS_ANOMALY_DETECTED |

			   TEGRA_CEC_INT_STAT_RX_START_BIT_DETECTED |

			   TEGRA_CEC_INT_STAT_RX_BUS_ERROR_DETECTED));

	} else if (status & TEGRA_CEC_INT_STAT_RX_REGISTER_FULL) {

			  TEGRA_CEC_INT_STAT_RX_START_BIT_DETECTED);

		cec->rx_done = false;

		cec->rx_buf_cnt = 0;

	}

	if (status & TEGRA_CEC_INT_STAT_RX_REGISTER_FULL) {

		u32 v;



		cec_write(cec, TEGRA_CEC_INT_STAT,
@@ -255,7 +252,7 @@ static int tegra_cec_adap_enable(struct cec_adapter *adap, bool enable) 
		  TEGRA_CEC_INT_MASK_TX_BUS_ANOMALY_DETECTED |

		  TEGRA_CEC_INT_MASK_TX_FRAME_TRANSMITTED |

		  TEGRA_CEC_INT_MASK_RX_REGISTER_FULL |

		  TEGRA_CEC_INT_MASK_RX_REGISTER_OVERRUN);

		  TEGRA_CEC_INT_MASK_RX_START_BIT_DETECTED);



	cec_write(cec, TEGRA_CEC_HW_CONTROL, TEGRA_CEC_HWCTRL_TX_RX_MODE);

	return 0;

include/uapi/linux/lirc.h

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 
#define LIRC_CAN_SEND_RAW              LIRC_MODE2SEND(LIRC_MODE_RAW)

#define LIRC_CAN_SEND_PULSE            LIRC_MODE2SEND(LIRC_MODE_PULSE)

#define LIRC_CAN_SEND_MODE2            LIRC_MODE2SEND(LIRC_MODE_MODE2)

#define LIRC_CAN_SEND_SCANCODE         LIRC_MODE2SEND(LIRC_MODE_SCANCODE)

#define LIRC_CAN_SEND_LIRCCODE         LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)



#define LIRC_CAN_SEND_MASK             0x0000003f