diff options
| author | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-03-07 16:26:54 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-03-07 16:27:01 +0100 |
| commit | c81652a4a88ce65312e56321812ae54a73dae963 (patch) | |
| tree | 6fbfe5851529039cfbb417d828ef269f11a666a1 /drivers/media/cec | |
| parent | 8268d067508b0fb9988b5423a8539a21caba5f44 (diff) | |
| parent | 0bff66dcbe55cd4b13dfe53abad9268e34d48cbf (diff) | |
| download | linux-c81652a4a88ce65312e56321812ae54a73dae963.tar.bz2 | |
Merge tag 'br-v5.18q' of git://linuxtv.org/hverkuil/media_tree into media_stage
Tag branch
* tag 'br-v5.18q' of git://linuxtv.org/hverkuil/media_tree:
media: cec: seco: Drop pointless include
media: hantro: sunxi: Fix VP9 steps
media: imx: csis: Store pads format separately
doc: media: Document VP9 reference_mode miss-placement
doc: media: Document MM21 tiled format
media: imx: imx8mq-mipi-csi2: Remove YUV422 2X8
media: v4l2-core: Initialize h264 scaling matrix
media: imx: imx-mipi-csis: Add output format
media: imx: imx-mipi-csis: Add BGR888
media: imx: imx-mipi-csis: Add RGB565_1X16
media: imx: imx-mipi-csis: Set PIXEL_MODE for YUV422
media: imx: imx7-media-csi: Use dual sampling for YUV 1X16
media: imx: Rename imx7-mipi-csis.c to imx-mipi-csis.c
media: imx: De-stage imx7-mipi-csis
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media/cec')
| -rw-r--r-- | drivers/media/cec/platform/seco/seco-cec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/cec/platform/seco/seco-cec.c b/drivers/media/cec/platform/seco/seco-cec.c index 78856a55e637..51a6fcfd077d 100644 --- a/drivers/media/cec/platform/seco/seco-cec.c +++ b/drivers/media/cec/platform/seco/seco-cec.c @@ -12,7 +12,6 @@ #include <linux/delay.h> #include <linux/dmi.h> #include <linux/gpio/consumer.h> -#include <linux/gpio.h> #include <linux/interrupt.h> #include <linux/pci.h> #include <linux/platform_device.h> @@ -551,7 +550,7 @@ static int secocec_acpi_probe(struct secocec_data *sdev) struct gpio_desc *gpio; int irq = 0; - gpio = devm_gpiod_get(dev, NULL, GPIOF_IN); + gpio = devm_gpiod_get(dev, NULL, GPIOD_IN); if (IS_ERR(gpio)) { dev_err(dev, "Cannot request interrupt gpio\n"); return PTR_ERR(gpio); |