diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-19 10:01:27 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-19 10:01:27 -0400 |
| commit | 7368a665fb688b451afb839f708995b9af33efbd (patch) | |
| tree | 117df65081627ea2fbd4300b25b8668c74445588 | |
| parent | 23998672ddc17bada3edf1ac45b0ec7c9ee1ed40 (diff) | |
| download | longterm-queue-4.8-7368a665fb688b451afb839f708995b9af33efbd.tar.gz | |
media: drop patch for 4.9-rc4+
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/media-cxusb-Use-a-dma-capable-buffer-also-for-readin.patch | 60 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 61 deletions
diff --git a/queue/media-cxusb-Use-a-dma-capable-buffer-also-for-readin.patch b/queue/media-cxusb-Use-a-dma-capable-buffer-also-for-readin.patch deleted file mode 100644 index 0a85659..0000000 --- a/queue/media-cxusb-Use-a-dma-capable-buffer-also-for-readin.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 3f190e3aec212fc8c61e202c51400afa7384d4bc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de> -Date: Sun, 5 Feb 2017 12:57:59 -0200 -Subject: [PATCH] [media] cxusb: Use a dma capable buffer also for reading -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -commit 3f190e3aec212fc8c61e202c51400afa7384d4bc upstream. - -Commit 17ce039b4e54 ("[media] cxusb: don't do DMA on stack") -added a kmalloc'ed bounce buffer for writes, but missed to do the same -for reads. As the read only happens after the write is finished, we can -reuse the same buffer. - -As dvb_usb_generic_rw handles a read length of 0 by itself, avoid calling -it using the dvb_usb_generic_read wrapper function. - -Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> -Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> - -diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c -index 5d7b4eaa6a3c..51620e02292f 100644 ---- a/drivers/media/usb/dvb-usb/cxusb.c -+++ b/drivers/media/usb/dvb-usb/cxusb.c -@@ -59,23 +59,24 @@ static int cxusb_ctrl_msg(struct dvb_usb_device *d, - u8 cmd, u8 *wbuf, int wlen, u8 *rbuf, int rlen) - { - struct cxusb_state *st = d->priv; -- int ret, wo; -+ int ret; - - if (1 + wlen > MAX_XFER_SIZE) { - warn("i2c wr: len=%d is too big!\n", wlen); - return -EOPNOTSUPP; - } - -- wo = (rbuf == NULL || rlen == 0); /* write-only */ -+ if (rlen > MAX_XFER_SIZE) { -+ warn("i2c rd: len=%d is too big!\n", rlen); -+ return -EOPNOTSUPP; -+ } - - mutex_lock(&d->data_mutex); - st->data[0] = cmd; - memcpy(&st->data[1], wbuf, wlen); -- if (wo) -- ret = dvb_usb_generic_write(d, st->data, 1 + wlen); -- else -- ret = dvb_usb_generic_rw(d, st->data, 1 + wlen, -- rbuf, rlen, 0); -+ ret = dvb_usb_generic_rw(d, st->data, 1 + wlen, st->data, rlen, 0); -+ if (!ret && rbuf && rlen) -+ memcpy(rbuf, st->data, rlen); - - mutex_unlock(&d->data_mutex); - return ret; --- -2.12.0 - diff --git a/queue/series b/queue/series index 2c02b0f..107926c 100644 --- a/queue/series +++ b/queue/series @@ -191,6 +191,5 @@ rtc-tegra-Implement-clock-handling.patch mm-Tighten-x86-dev-mem-with-zeroing-reads.patch media-dvb-usb-don-t-use-stack-for-firmware-load.patch media-dvb-usb-firmware-don-t-do-DMA-on-stack.patch -cxusb-Use-a-dma-capable-buffer-also-for-reading.patch virtio-console-avoid-DMA-from-stack.patch net-ipv6-check-route-protocol-when-deleting-routes.patch |