From 3627ca1ec82c3d971dfbf99ba874e7a2a3b9a198 Mon Sep 17 00:00:00 2001
From: CvH <namerp@googlemail.com>
Date: Sat, 15 Feb 2020 17:56:07 +0100
Subject: [PATCH] media_tree: update to 2020-02-09

---
 .../dvb/depends/media_tree/package.mk            |  4 ++--
 .../patches/media_tree-01-m88ds3103b.patch       | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/linux-driver-addons/dvb/depends/media_tree/package.mk b/packages/linux-driver-addons/dvb/depends/media_tree/package.mk
index 95cfb17466..eebf1ad748 100644
--- a/packages/linux-driver-addons/dvb/depends/media_tree/package.mk
+++ b/packages/linux-driver-addons/dvb/depends/media_tree/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="media_tree"
-PKG_VERSION="2019-07-11-22be8233b34f"
-PKG_SHA256="14363b1aacfe59805a1fe93739caed53036879e7b871f1d8d7061527c3cb9eb8"
+PKG_VERSION="2020-02-09-bb6d3fb354c5"
+PKG_SHA256="d6b7088393b4676a94f628b37722e9a36efef65408d003e0b3bafa4933a5416b"
 PKG_LICENSE="GPL"
 PKG_SITE="https://git.linuxtv.org/media_tree.git"
 PKG_URL="http://linuxtv.org/downloads/drivers/linux-media-${PKG_VERSION}.tar.bz2"
diff --git a/packages/linux-driver-addons/dvb/depends/media_tree/patches/media_tree-01-m88ds3103b.patch b/packages/linux-driver-addons/dvb/depends/media_tree/patches/media_tree-01-m88ds3103b.patch
index 5a9d93737b..c20d641d75 100644
--- a/packages/linux-driver-addons/dvb/depends/media_tree/patches/media_tree-01-m88ds3103b.patch
+++ b/packages/linux-driver-addons/dvb/depends/media_tree/patches/media_tree-01-m88ds3103b.patch
@@ -3,7 +3,7 @@ https://git.linuxtv.org/brad/media_tree.git/log/?h=Montage-3103b.v2
 support for m88ds3103b
 
 diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
-index 3a367a5..0d3b81d 100644
+index c96f05f..a95461e 100644
 --- a/drivers/media/dvb-frontends/m88ds3103.c
 +++ b/drivers/media/dvb-frontends/m88ds3103.c
 @@ -64,6 +64,92 @@ err:
@@ -613,7 +613,7 @@ index c825032..d656ec2 100644
  
  struct m88ds3103_reg_val {
 diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
-index 1283c7c..6561f7b 100644
+index def9cdd..a8c321d 100644
 --- a/drivers/media/usb/em28xx/em28xx-cards.c
 +++ b/drivers/media/usb/em28xx/em28xx-cards.c
 @@ -2397,6 +2397,20 @@ const struct em28xx_board em28xx_boards[] = {
@@ -637,7 +637,7 @@ index 1283c7c..6561f7b 100644
  	/*
  	 * 2013:025f PCTV tripleStick (292e).
  	 * Empia EM28178, Silicon Labs Si2168, Silicon Labs Si2157
-@@ -2678,6 +2692,10 @@ struct usb_device_id em28xx_id_table[] = {
+@@ -2696,6 +2710,10 @@ struct usb_device_id em28xx_id_table[] = {
  			.driver_info = EM2765_BOARD_SPEEDLINK_VAD_LAPLACE },
  	{ USB_DEVICE(0x2013, 0x0258),
  			.driver_info = EM28178_BOARD_PCTV_461E },
@@ -649,7 +649,7 @@ index 1283c7c..6561f7b 100644
  			.driver_info = EM28178_BOARD_PCTV_292E },
  	{ USB_DEVICE(0x2013, 0x0264), /* Hauppauge WinTV-soloHD 292e SE */
 diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
-index a73faf1..e2ddc25 100644
+index 0ab6c49..cd7e40c 100644
 --- a/drivers/media/usb/em28xx/em28xx-dvb.c
 +++ b/drivers/media/usb/em28xx/em28xx-dvb.c
 @@ -1219,6 +1219,65 @@ static int em28178_dvb_init_pctv_461e(struct em28xx *dev)
@@ -731,14 +731,14 @@ index a73faf1..e2ddc25 100644
  		result = em28178_dvb_init_pctv_292e(dev);
  		if (result)
 diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
-index a551072..1affdd1 100644
+index 4ecadd5..ec38598 100644
 --- a/drivers/media/usb/em28xx/em28xx.h
 +++ b/drivers/media/usb/em28xx/em28xx.h
-@@ -149,6 +149,7 @@
- #define EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595 100
+@@ -150,6 +150,7 @@
  #define EM2884_BOARD_TERRATEC_H6		  101
  #define EM2882_BOARD_ZOLID_HYBRID_TV_STICK		102
-+#define EM28178_BOARD_PCTV_461E_V2		  103
+ #define EM2861_BOARD_MAGIX_VIDEOWANDLER2          103
++#define EM28178_BOARD_PCTV_461E_V2		  104
  
  /* Limits minimum and default number of buffers */
  #define EM28XX_MIN_BUF 4