mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
linux: remove leftovers after rebasing
This commit is contained in:
parent
c119d6a47c
commit
96aa8967e0
@ -1,16 +0,0 @@
|
||||
# see https://github.com/wongsyrone/openwrt-1/commit/93c0a5173414cfa7684547de3c3a1f3dc4240383
|
||||
# and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65932
|
||||
|
||||
diff -Naur linux-4.1.10.orig/arch/arm/Makefile linux-4.1.10/arch/arm/Makefile
|
||||
--- linux-4.1.10.orig/arch/arm/Makefile 2015-10-03 04:49:38.000000000 -0700
|
||||
+++ linux-4.1.10/arch/arm/Makefile 2015-10-05 13:43:26.066966475 -0700
|
||||
@@ -118,7 +118,8 @@
|
||||
endif
|
||||
|
||||
# Need -Uarm for gcc < 3.x
|
||||
-KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
|
||||
+# Maybe we need -fno-ipa-sra for gcc > 4.9.x
|
||||
+KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm -fno-ipa-sra
|
||||
KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float
|
||||
|
||||
CHECKFLAGS += -D__arm__
|
@ -1,54 +0,0 @@
|
||||
# from upstream http://git.linuxtv.org/cgit.cgi/anttip/media_tree.git/commit/?h=rtl2832u_test2&id=3fde4395e9c58ab45470529f29864446230c5368
|
||||
|
||||
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
||||
index c3cac4c..197a4f2 100644
|
||||
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
||||
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
||||
@@ -34,6 +34,14 @@ static int rtl28xxu_ctrl_msg(struct dvb_usb_device *d, struct rtl28xxu_req *req)
|
||||
unsigned int pipe;
|
||||
u8 requesttype;
|
||||
|
||||
+ mutex_lock(&d->usb_mutex);
|
||||
+
|
||||
+ if (req->size > sizeof(dev->buf)) {
|
||||
+ dev_err(&d->intf->dev, "too large message %u\n", req->size);
|
||||
+ ret = -EINVAL;
|
||||
+ goto err_mutex_unlock;
|
||||
+ }
|
||||
+
|
||||
if (req->index & CMD_WR_FLAG) {
|
||||
/* write */
|
||||
memcpy(dev->buf, req->data, req->size);
|
||||
@@ -50,14 +58,17 @@ static int rtl28xxu_ctrl_msg(struct dvb_usb_device *d, struct rtl28xxu_req *req)
|
||||
dvb_usb_dbg_usb_control_msg(d->udev, 0, requesttype, req->value,
|
||||
req->index, dev->buf, req->size);
|
||||
if (ret < 0)
|
||||
- goto err;
|
||||
+ goto err_mutex_unlock;
|
||||
|
||||
/* read request, copy returned data to return buf */
|
||||
if (requesttype == (USB_TYPE_VENDOR | USB_DIR_IN))
|
||||
memcpy(req->data, dev->buf, req->size);
|
||||
|
||||
+ mutex_unlock(&d->usb_mutex);
|
||||
+
|
||||
return 0;
|
||||
-err:
|
||||
+err_mutex_unlock:
|
||||
+ mutex_unlock(&d->usb_mutex);
|
||||
dev_dbg(&d->intf->dev, "failed=%d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
|
||||
index 9f6115a..1380629 100644
|
||||
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
|
||||
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
|
||||
@@ -71,7 +71,7 @@
|
||||
|
||||
|
||||
struct rtl28xxu_dev {
|
||||
- u8 buf[28];
|
||||
+ u8 buf[128];
|
||||
u8 chip_id;
|
||||
u8 tuner;
|
||||
char *tuner_name;
|
34137
packages/linux/patches/4.1.12/linux-221-ngene-octopus.patch
vendored
34137
packages/linux/patches/4.1.12/linux-221-ngene-octopus.patch
vendored
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user