mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
Merge pull request #1515 from CvH/tbs_suspend
media_build: fix suspend of cx231xx
This commit is contained in:
commit
b4802bd5c4
@ -1,6 +1,6 @@
|
|||||||
--- a/backports/backports.txt
|
--- a/backports/backports.txt
|
||||||
+++ b/backports/backports.txt
|
+++ b/backports/backports.txt
|
||||||
@@ -25,6 +25,15 @@
|
@@ -25,6 +25,16 @@
|
||||||
add pr_fmt.patch
|
add pr_fmt.patch
|
||||||
add debug.patch
|
add debug.patch
|
||||||
add drx39xxj.patch
|
add drx39xxj.patch
|
||||||
@ -13,6 +13,7 @@
|
|||||||
+add linux-062-imon_pad_ignore_diagonal.patch
|
+add linux-062-imon_pad_ignore_diagonal.patch
|
||||||
+add linux-063-fix-rc-raw-decoder-loading.patch
|
+add linux-063-fix-rc-raw-decoder-loading.patch
|
||||||
+add linux-240-pctv452e_kernel_oops_in_4.9.patch
|
+add linux-240-pctv452e_kernel_oops_in_4.9.patch
|
||||||
|
+add linux-220-cx231xx-suspend-fix.patch
|
||||||
|
|
||||||
[4.8.255]
|
[4.8.255]
|
||||||
add v4.8_user_pages_flag.patch
|
add v4.8_user_pages_flag.patch
|
||||||
|
@ -0,0 +1,31 @@
|
|||||||
|
drop at next major media_build bump
|
||||||
|
fixes https://github.com/tbsdtv/linux_media/issues/40
|
||||||
|
|
||||||
|
From f10b80837b205be12e3b511a14c184f1873ce1d6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: CrazyCat <crazycat69@narod.ru>
|
||||||
|
Date: Fri, 31 Mar 2017 01:04:42 +0300
|
||||||
|
Subject: [PATCH] cx231xx-dvb: Fixed merge issue in unregister_dvb().
|
||||||
|
|
||||||
|
---
|
||||||
|
drivers/media/usb/cx231xx/cx231xx-dvb.c | 8 --------
|
||||||
|
1 file changed, 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
|
||||||
|
index 593be48..fb477e9 100644
|
||||||
|
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
|
||||||
|
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
|
||||||
|
@@ -755,14 +755,6 @@ static void unregister_dvb(struct cx231xx_dvb *dvb)
|
||||||
|
}
|
||||||
|
dvb_unregister_frontend(dvb->frontend);
|
||||||
|
dvb_frontend_detach(dvb->frontend);
|
||||||
|
-
|
||||||
|
- client = dvb->i2c_client_demod;
|
||||||
|
- /* remove I2C demod */
|
||||||
|
- if (client) {
|
||||||
|
- module_put(client->dev.driver->owner);
|
||||||
|
- i2c_unregister_device(client);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
dvb_unregister_adapter(&dvb->adapter);
|
||||||
|
}
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user