Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-12
+1
-1
drivers/media/Kconfig
+1
-1
drivers/media/Kconfig
···
151
151
select VIDEOBUF2_VMALLOC
152
152
default n
153
153
help
154
-
This option enables DVB experimental memory-mapped API, with
154
+
This option enables DVB experimental memory-mapped API, which
155
155
reduces the number of context switches to read DVB buffers, as
156
156
the buffers can use mmap() syscalls.
157
157
+7
-10
drivers/media/platform/tegra-cec/tegra_cec.c
+7
-10
drivers/media/platform/tegra-cec/tegra_cec.c
···
172
172
}
173
173
}
174
174
175
-
if (status & (TEGRA_CEC_INT_STAT_RX_REGISTER_OVERRUN |
176
-
TEGRA_CEC_INT_STAT_RX_BUS_ANOMALY_DETECTED |
177
-
TEGRA_CEC_INT_STAT_RX_START_BIT_DETECTED |
178
-
TEGRA_CEC_INT_STAT_RX_BUS_ERROR_DETECTED)) {
175
+
if (status & TEGRA_CEC_INT_STAT_RX_START_BIT_DETECTED) {
179
176
cec_write(cec, TEGRA_CEC_INT_STAT,
180
-
(TEGRA_CEC_INT_STAT_RX_REGISTER_OVERRUN |
181
-
TEGRA_CEC_INT_STAT_RX_BUS_ANOMALY_DETECTED |
182
-
TEGRA_CEC_INT_STAT_RX_START_BIT_DETECTED |
183
-
TEGRA_CEC_INT_STAT_RX_BUS_ERROR_DETECTED));
184
-
} else if (status & TEGRA_CEC_INT_STAT_RX_REGISTER_FULL) {
177
+
TEGRA_CEC_INT_STAT_RX_START_BIT_DETECTED);
178
+
cec->rx_done = false;
179
+
cec->rx_buf_cnt = 0;
180
+
}
181
+
if (status & TEGRA_CEC_INT_STAT_RX_REGISTER_FULL) {
185
182
u32 v;
186
183
187
184
cec_write(cec, TEGRA_CEC_INT_STAT,
···
252
255
TEGRA_CEC_INT_MASK_TX_BUS_ANOMALY_DETECTED |
253
256
TEGRA_CEC_INT_MASK_TX_FRAME_TRANSMITTED |
254
257
TEGRA_CEC_INT_MASK_RX_REGISTER_FULL |
255
-
TEGRA_CEC_INT_MASK_RX_REGISTER_OVERRUN);
258
+
TEGRA_CEC_INT_MASK_RX_START_BIT_DETECTED);
256
259
257
260
cec_write(cec, TEGRA_CEC_HW_CONTROL, TEGRA_CEC_HWCTRL_TX_RX_MODE);
258
261
return 0;
-1
include/uapi/linux/lirc.h
-1
include/uapi/linux/lirc.h
···
54
54
#define LIRC_CAN_SEND_RAW LIRC_MODE2SEND(LIRC_MODE_RAW)
55
55
#define LIRC_CAN_SEND_PULSE LIRC_MODE2SEND(LIRC_MODE_PULSE)
56
56
#define LIRC_CAN_SEND_MODE2 LIRC_MODE2SEND(LIRC_MODE_MODE2)
57
-
#define LIRC_CAN_SEND_SCANCODE LIRC_MODE2SEND(LIRC_MODE_SCANCODE)
58
57
#define LIRC_CAN_SEND_LIRCCODE LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
59
58
60
59
#define LIRC_CAN_SEND_MASK 0x0000003f