From 09181ba7d8c25a3dff09097e2034deb6701a4d54 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 15 Nov 2018 11:57:33 +0000 Subject: [PATCH] linux (RPi): update to linux-f2bea78 (4.19.2) --- packages/linux/package.mk | 4 +- .../linux-999-revert-dvb-t680ci-commit.patch | 60 ------------------- 2 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 packages/linux/patches/raspberrypi/linux-999-revert-dvb-t680ci-commit.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 5ece926b8f..428e61112c 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -38,8 +38,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; raspberrypi) - PKG_VERSION="f9b3532aac729a920fd19c33bed2c6974e38c9ac" # 4.19.1 - PKG_SHA256="80f7de19edee05491e2623dfa314c67b353a8a86341f1fbb34a7a232c08e2413" + PKG_VERSION="f2bea78388b8d0abb5583b5d945b4a86d1ad667f" # 4.19.2 + PKG_SHA256="01ad75713c1375a572dc062289130adc3fe043384a0d623afdba368d72f3443f" PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; diff --git a/packages/linux/patches/raspberrypi/linux-999-revert-dvb-t680ci-commit.patch b/packages/linux/patches/raspberrypi/linux-999-revert-dvb-t680ci-commit.patch deleted file mode 100644 index 41793d7173..0000000000 --- a/packages/linux/patches/raspberrypi/linux-999-revert-dvb-t680ci-commit.patch +++ /dev/null @@ -1,60 +0,0 @@ -From c24b2ad9c085685c2cace7733c22dbc80a95de27 Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Thu, 16 Aug 2018 21:24:14 +0100 -Subject: [PATCH] Revert "media: dvbsky: use just one mutex for serializing - device R/W ops" - -This reverts commit 7d95fb746c4eece67308f1642a666ea1ebdbd2cc. ---- - drivers/media/usb/dvb-usb-v2/dvbsky.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c -index 1aa88d9..e28bd88 100644 ---- a/drivers/media/usb/dvb-usb-v2/dvbsky.c -+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c -@@ -31,6 +31,7 @@ MODULE_PARM_DESC(disable_rc, "Disable inbuilt IR receiver."); - DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); - - struct dvbsky_state { -+ struct mutex stream_mutex; - u8 ibuf[DVBSKY_BUF_LEN]; - u8 obuf[DVBSKY_BUF_LEN]; - u8 last_lock; -@@ -67,17 +68,18 @@ static int dvbsky_usb_generic_rw(struct dvb_usb_device *d, - - static int dvbsky_stream_ctrl(struct dvb_usb_device *d, u8 onoff) - { -+ struct dvbsky_state *state = d_to_priv(d); - int ret; -- static u8 obuf_pre[3] = { 0x37, 0, 0 }; -- static u8 obuf_post[3] = { 0x36, 3, 0 }; -+ u8 obuf_pre[3] = { 0x37, 0, 0 }; -+ u8 obuf_post[3] = { 0x36, 3, 0 }; - -- mutex_lock(&d->usb_mutex); -- ret = dvb_usbv2_generic_rw_locked(d, obuf_pre, 3, NULL, 0); -+ mutex_lock(&state->stream_mutex); -+ ret = dvbsky_usb_generic_rw(d, obuf_pre, 3, NULL, 0); - if (!ret && onoff) { - msleep(20); -- ret = dvb_usbv2_generic_rw_locked(d, obuf_post, 3, NULL, 0); -+ ret = dvbsky_usb_generic_rw(d, obuf_post, 3, NULL, 0); - } -- mutex_unlock(&d->usb_mutex); -+ mutex_unlock(&state->stream_mutex); - return ret; - } - -@@ -606,6 +608,8 @@ static int dvbsky_init(struct dvb_usb_device *d) - if (ret) - return ret; - */ -+ mutex_init(&state->stream_mutex); -+ - state->last_lock = 0; - - return 0; --- -2.14.1 -