mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
linux: update to linux-4.1.4
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
ce0b6dd0b4
commit
03171670d5
@ -40,7 +40,7 @@ case "$LINUX" in
|
|||||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan"
|
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
PKG_VERSION="4.1.3"
|
PKG_VERSION="4.1.4"
|
||||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -540,29 +540,6 @@ diff -urN a/drivers/media/pci/saa7164/saa7164-dvb.c b/drivers/media/pci/saa7164/
|
|||||||
+ return -1;
|
+ return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
diff -urN a/drivers/media/pci/saa7164/saa7164-encoder.c b/drivers/media/pci/saa7164/saa7164-encoder.c
|
|
||||||
--- a/drivers/media/pci/saa7164/saa7164-encoder.c 2015-06-22 08:05:43.000000000 +0300
|
|
||||||
+++ b/drivers/media/pci/saa7164/saa7164-encoder.c 2015-06-24 18:41:23.254376349 +0300
|
|
||||||
@@ -721,13 +721,14 @@
|
|
||||||
sizeof(cap->card));
|
|
||||||
sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
|
|
||||||
|
|
||||||
- cap->capabilities =
|
|
||||||
+ cap->device_caps =
|
|
||||||
V4L2_CAP_VIDEO_CAPTURE |
|
|
||||||
- V4L2_CAP_READWRITE |
|
|
||||||
- 0;
|
|
||||||
+ V4L2_CAP_READWRITE |
|
|
||||||
+ V4L2_CAP_TUNER;
|
|
||||||
|
|
||||||
- cap->capabilities |= V4L2_CAP_TUNER;
|
|
||||||
- cap->version = 0;
|
|
||||||
+ cap->capabilities = cap->device_caps |
|
|
||||||
+ V4L2_CAP_VBI_CAPTURE |
|
|
||||||
+ V4L2_CAP_DEVICE_CAPS;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
diff -urN a/drivers/media/pci/saa7164/saa7164.h b/drivers/media/pci/saa7164/saa7164.h
|
diff -urN a/drivers/media/pci/saa7164/saa7164.h b/drivers/media/pci/saa7164/saa7164.h
|
||||||
--- a/drivers/media/pci/saa7164/saa7164.h 2015-06-22 08:05:43.000000000 +0300
|
--- a/drivers/media/pci/saa7164/saa7164.h 2015-06-22 08:05:43.000000000 +0300
|
||||||
+++ b/drivers/media/pci/saa7164/saa7164.h 2015-06-24 18:41:57.246377117 +0300
|
+++ b/drivers/media/pci/saa7164/saa7164.h 2015-06-24 18:41:57.246377117 +0300
|
||||||
@ -593,29 +570,6 @@ diff -urN a/drivers/media/pci/saa7164/saa7164.h b/drivers/media/pci/saa7164/saa7
|
|||||||
|
|
||||||
struct cmd cmds[SAA_CMD_MAX_MSG_UNITS];
|
struct cmd cmds[SAA_CMD_MAX_MSG_UNITS];
|
||||||
struct mutex lock;
|
struct mutex lock;
|
||||||
diff -urN a/drivers/media/pci/saa7164/saa7164-vbi.c b/drivers/media/pci/saa7164/saa7164-vbi.c
|
|
||||||
--- a/drivers/media/pci/saa7164/saa7164-vbi.c 2015-06-22 08:05:43.000000000 +0300
|
|
||||||
+++ b/drivers/media/pci/saa7164/saa7164-vbi.c 2015-06-24 18:42:05.582377305 +0300
|
|
||||||
@@ -660,13 +660,14 @@
|
|
||||||
sizeof(cap->card));
|
|
||||||
sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
|
|
||||||
|
|
||||||
- cap->capabilities =
|
|
||||||
+ cap->device_caps =
|
|
||||||
V4L2_CAP_VBI_CAPTURE |
|
|
||||||
- V4L2_CAP_READWRITE |
|
|
||||||
- 0;
|
|
||||||
+ V4L2_CAP_READWRITE |
|
|
||||||
+ V4L2_CAP_TUNER;
|
|
||||||
|
|
||||||
- cap->capabilities |= V4L2_CAP_TUNER;
|
|
||||||
- cap->version = 0;
|
|
||||||
+ cap->capabilities = cap->device_caps |
|
|
||||||
+ V4L2_CAP_VIDEO_CAPTURE |
|
|
||||||
+ V4L2_CAP_DEVICE_CAPS;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
diff -urN a/drivers/media/pci/saa7164/saa7164-i2c.c b/drivers/media/pci/saa7164/saa7164-i2c.c
|
diff -urN a/drivers/media/pci/saa7164/saa7164-i2c.c b/drivers/media/pci/saa7164/saa7164-i2c.c
|
||||||
--- a/drivers/media/pci/saa7164/saa7164-i2c.c
|
--- a/drivers/media/pci/saa7164/saa7164-i2c.c
|
||||||
+++ b/drivers/media/pci/saa7164/saa7164-i2c.c
|
+++ b/drivers/media/pci/saa7164/saa7164-i2c.c
|
Loading…
x
Reference in New Issue
Block a user