1 |
commit: a9ff5c21104641ed6c1123301ab8cf18eea1be84 |
2 |
Author: Alice Ferrazzi <alicef <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 22 09:59:11 2018 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 14 11:36:22 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=a9ff5c21 |
7 |
|
8 |
linux kernel 4.18.4 |
9 |
|
10 |
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> |
11 |
|
12 |
0000_README | 4 + |
13 |
1003_linux-4.18.4.patch | 817 ++++++++++++++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 821 insertions(+) |
15 |
|
16 |
diff --git a/0000_README b/0000_README |
17 |
index c313d8e..c7d6cc0 100644 |
18 |
--- a/0000_README |
19 |
+++ b/0000_README |
20 |
@@ -55,6 +55,10 @@ Patch: 1002_linux-4.18.3.patch |
21 |
From: http://www.kernel.org |
22 |
Desc: Linux 4.18.3 |
23 |
|
24 |
+Patch: 1003_linux-4.18.4.patch |
25 |
+From: http://www.kernel.org |
26 |
+Desc: Linux 4.18.4 |
27 |
+ |
28 |
Patch: 1500_XATTR_USER_PREFIX.patch |
29 |
From: https://bugs.gentoo.org/show_bug.cgi?id=470644 |
30 |
Desc: Support for namespace user.pax.* on tmpfs. |
31 |
|
32 |
diff --git a/1003_linux-4.18.4.patch b/1003_linux-4.18.4.patch |
33 |
new file mode 100644 |
34 |
index 0000000..a94a413 |
35 |
--- /dev/null |
36 |
+++ b/1003_linux-4.18.4.patch |
37 |
@@ -0,0 +1,817 @@ |
38 |
+diff --git a/Makefile b/Makefile |
39 |
+index e2bd815f24eb..ef0dd566c104 100644 |
40 |
+--- a/Makefile |
41 |
++++ b/Makefile |
42 |
+@@ -1,7 +1,7 @@ |
43 |
+ # SPDX-License-Identifier: GPL-2.0 |
44 |
+ VERSION = 4 |
45 |
+ PATCHLEVEL = 18 |
46 |
+-SUBLEVEL = 3 |
47 |
++SUBLEVEL = 4 |
48 |
+ EXTRAVERSION = |
49 |
+ NAME = Merciless Moray |
50 |
+ |
51 |
+diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c |
52 |
+index 5d0486f1cfcd..1a1c0718cd7a 100644 |
53 |
+--- a/drivers/acpi/sleep.c |
54 |
++++ b/drivers/acpi/sleep.c |
55 |
+@@ -338,6 +338,14 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { |
56 |
+ DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"), |
57 |
+ }, |
58 |
+ }, |
59 |
++ { |
60 |
++ .callback = init_nvs_save_s3, |
61 |
++ .ident = "Asus 1025C", |
62 |
++ .matches = { |
63 |
++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), |
64 |
++ DMI_MATCH(DMI_PRODUCT_NAME, "1025C"), |
65 |
++ }, |
66 |
++ }, |
67 |
+ /* |
68 |
+ * https://bugzilla.kernel.org/show_bug.cgi?id=189431 |
69 |
+ * Lenovo G50-45 is a platform later than 2012, but needs nvs memory |
70 |
+diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c |
71 |
+index 7a501dbe7123..6a5b3f00f9ad 100644 |
72 |
+--- a/drivers/isdn/i4l/isdn_common.c |
73 |
++++ b/drivers/isdn/i4l/isdn_common.c |
74 |
+@@ -1640,13 +1640,7 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) |
75 |
+ } else |
76 |
+ return -EINVAL; |
77 |
+ case IIOCDBGVAR: |
78 |
+- if (arg) { |
79 |
+- if (copy_to_user(argp, &dev, sizeof(ulong))) |
80 |
+- return -EFAULT; |
81 |
+- return 0; |
82 |
+- } else |
83 |
+- return -EINVAL; |
84 |
+- break; |
85 |
++ return -EINVAL; |
86 |
+ default: |
87 |
+ if ((cmd & IIOCDRVCTL) == IIOCDRVCTL) |
88 |
+ cmd = ((cmd >> _IOC_NRSHIFT) & _IOC_NRMASK) & ISDN_DRVIOCTL_MASK; |
89 |
+diff --git a/drivers/media/usb/dvb-usb-v2/gl861.c b/drivers/media/usb/dvb-usb-v2/gl861.c |
90 |
+index 9d154fdae45b..fee4b30df778 100644 |
91 |
+--- a/drivers/media/usb/dvb-usb-v2/gl861.c |
92 |
++++ b/drivers/media/usb/dvb-usb-v2/gl861.c |
93 |
+@@ -26,10 +26,14 @@ static int gl861_i2c_msg(struct dvb_usb_device *d, u8 addr, |
94 |
+ if (wo) { |
95 |
+ req = GL861_REQ_I2C_WRITE; |
96 |
+ type = GL861_WRITE; |
97 |
++ buf = kmemdup(wbuf, wlen, GFP_KERNEL); |
98 |
+ } else { /* rw */ |
99 |
+ req = GL861_REQ_I2C_READ; |
100 |
+ type = GL861_READ; |
101 |
++ buf = kmalloc(rlen, GFP_KERNEL); |
102 |
+ } |
103 |
++ if (!buf) |
104 |
++ return -ENOMEM; |
105 |
+ |
106 |
+ switch (wlen) { |
107 |
+ case 1: |
108 |
+@@ -42,24 +46,19 @@ static int gl861_i2c_msg(struct dvb_usb_device *d, u8 addr, |
109 |
+ default: |
110 |
+ dev_err(&d->udev->dev, "%s: wlen=%d, aborting\n", |
111 |
+ KBUILD_MODNAME, wlen); |
112 |
++ kfree(buf); |
113 |
+ return -EINVAL; |
114 |
+ } |
115 |
+- buf = NULL; |
116 |
+- if (rlen > 0) { |
117 |
+- buf = kmalloc(rlen, GFP_KERNEL); |
118 |
+- if (!buf) |
119 |
+- return -ENOMEM; |
120 |
+- } |
121 |
++ |
122 |
+ usleep_range(1000, 2000); /* avoid I2C errors */ |
123 |
+ |
124 |
+ ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), req, type, |
125 |
+ value, index, buf, rlen, 2000); |
126 |
+- if (rlen > 0) { |
127 |
+- if (ret > 0) |
128 |
+- memcpy(rbuf, buf, rlen); |
129 |
+- kfree(buf); |
130 |
+- } |
131 |
+ |
132 |
++ if (!wo && ret > 0) |
133 |
++ memcpy(rbuf, buf, rlen); |
134 |
++ |
135 |
++ kfree(buf); |
136 |
+ return ret; |
137 |
+ } |
138 |
+ |
139 |
+diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c |
140 |
+index c5dc6095686a..679647713e36 100644 |
141 |
+--- a/drivers/misc/sram.c |
142 |
++++ b/drivers/misc/sram.c |
143 |
+@@ -407,13 +407,20 @@ static int sram_probe(struct platform_device *pdev) |
144 |
+ if (init_func) { |
145 |
+ ret = init_func(); |
146 |
+ if (ret) |
147 |
+- return ret; |
148 |
++ goto err_disable_clk; |
149 |
+ } |
150 |
+ |
151 |
+ dev_dbg(sram->dev, "SRAM pool: %zu KiB @ 0x%p\n", |
152 |
+ gen_pool_size(sram->pool) / 1024, sram->virt_base); |
153 |
+ |
154 |
+ return 0; |
155 |
++ |
156 |
++err_disable_clk: |
157 |
++ if (sram->clk) |
158 |
++ clk_disable_unprepare(sram->clk); |
159 |
++ sram_free_partitions(sram); |
160 |
++ |
161 |
++ return ret; |
162 |
+ } |
163 |
+ |
164 |
+ static int sram_remove(struct platform_device *pdev) |
165 |
+diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c |
166 |
+index 0ad2f3f7da85..82ac1d10f239 100644 |
167 |
+--- a/drivers/net/ethernet/marvell/mvneta.c |
168 |
++++ b/drivers/net/ethernet/marvell/mvneta.c |
169 |
+@@ -1901,10 +1901,10 @@ static void mvneta_rxq_drop_pkts(struct mvneta_port *pp, |
170 |
+ } |
171 |
+ |
172 |
+ /* Main rx processing when using software buffer management */ |
173 |
+-static int mvneta_rx_swbm(struct mvneta_port *pp, int rx_todo, |
174 |
++static int mvneta_rx_swbm(struct napi_struct *napi, |
175 |
++ struct mvneta_port *pp, int rx_todo, |
176 |
+ struct mvneta_rx_queue *rxq) |
177 |
+ { |
178 |
+- struct mvneta_pcpu_port *port = this_cpu_ptr(pp->ports); |
179 |
+ struct net_device *dev = pp->dev; |
180 |
+ int rx_done; |
181 |
+ u32 rcvd_pkts = 0; |
182 |
+@@ -1959,7 +1959,7 @@ err_drop_frame: |
183 |
+ |
184 |
+ skb->protocol = eth_type_trans(skb, dev); |
185 |
+ mvneta_rx_csum(pp, rx_status, skb); |
186 |
+- napi_gro_receive(&port->napi, skb); |
187 |
++ napi_gro_receive(napi, skb); |
188 |
+ |
189 |
+ rcvd_pkts++; |
190 |
+ rcvd_bytes += rx_bytes; |
191 |
+@@ -2001,7 +2001,7 @@ err_drop_frame: |
192 |
+ |
193 |
+ mvneta_rx_csum(pp, rx_status, skb); |
194 |
+ |
195 |
+- napi_gro_receive(&port->napi, skb); |
196 |
++ napi_gro_receive(napi, skb); |
197 |
+ } |
198 |
+ |
199 |
+ if (rcvd_pkts) { |
200 |
+@@ -2020,10 +2020,10 @@ err_drop_frame: |
201 |
+ } |
202 |
+ |
203 |
+ /* Main rx processing when using hardware buffer management */ |
204 |
+-static int mvneta_rx_hwbm(struct mvneta_port *pp, int rx_todo, |
205 |
++static int mvneta_rx_hwbm(struct napi_struct *napi, |
206 |
++ struct mvneta_port *pp, int rx_todo, |
207 |
+ struct mvneta_rx_queue *rxq) |
208 |
+ { |
209 |
+- struct mvneta_pcpu_port *port = this_cpu_ptr(pp->ports); |
210 |
+ struct net_device *dev = pp->dev; |
211 |
+ int rx_done; |
212 |
+ u32 rcvd_pkts = 0; |
213 |
+@@ -2085,7 +2085,7 @@ err_drop_frame: |
214 |
+ |
215 |
+ skb->protocol = eth_type_trans(skb, dev); |
216 |
+ mvneta_rx_csum(pp, rx_status, skb); |
217 |
+- napi_gro_receive(&port->napi, skb); |
218 |
++ napi_gro_receive(napi, skb); |
219 |
+ |
220 |
+ rcvd_pkts++; |
221 |
+ rcvd_bytes += rx_bytes; |
222 |
+@@ -2129,7 +2129,7 @@ err_drop_frame: |
223 |
+ |
224 |
+ mvneta_rx_csum(pp, rx_status, skb); |
225 |
+ |
226 |
+- napi_gro_receive(&port->napi, skb); |
227 |
++ napi_gro_receive(napi, skb); |
228 |
+ } |
229 |
+ |
230 |
+ if (rcvd_pkts) { |
231 |
+@@ -2722,9 +2722,11 @@ static int mvneta_poll(struct napi_struct *napi, int budget) |
232 |
+ if (rx_queue) { |
233 |
+ rx_queue = rx_queue - 1; |
234 |
+ if (pp->bm_priv) |
235 |
+- rx_done = mvneta_rx_hwbm(pp, budget, &pp->rxqs[rx_queue]); |
236 |
++ rx_done = mvneta_rx_hwbm(napi, pp, budget, |
237 |
++ &pp->rxqs[rx_queue]); |
238 |
+ else |
239 |
+- rx_done = mvneta_rx_swbm(pp, budget, &pp->rxqs[rx_queue]); |
240 |
++ rx_done = mvneta_rx_swbm(napi, pp, budget, |
241 |
++ &pp->rxqs[rx_queue]); |
242 |
+ } |
243 |
+ |
244 |
+ if (rx_done < budget) { |
245 |
+@@ -4018,13 +4020,18 @@ static int mvneta_config_rss(struct mvneta_port *pp) |
246 |
+ |
247 |
+ on_each_cpu(mvneta_percpu_mask_interrupt, pp, true); |
248 |
+ |
249 |
+- /* We have to synchronise on the napi of each CPU */ |
250 |
+- for_each_online_cpu(cpu) { |
251 |
+- struct mvneta_pcpu_port *pcpu_port = |
252 |
+- per_cpu_ptr(pp->ports, cpu); |
253 |
++ if (!pp->neta_armada3700) { |
254 |
++ /* We have to synchronise on the napi of each CPU */ |
255 |
++ for_each_online_cpu(cpu) { |
256 |
++ struct mvneta_pcpu_port *pcpu_port = |
257 |
++ per_cpu_ptr(pp->ports, cpu); |
258 |
+ |
259 |
+- napi_synchronize(&pcpu_port->napi); |
260 |
+- napi_disable(&pcpu_port->napi); |
261 |
++ napi_synchronize(&pcpu_port->napi); |
262 |
++ napi_disable(&pcpu_port->napi); |
263 |
++ } |
264 |
++ } else { |
265 |
++ napi_synchronize(&pp->napi); |
266 |
++ napi_disable(&pp->napi); |
267 |
+ } |
268 |
+ |
269 |
+ pp->rxq_def = pp->indir[0]; |
270 |
+@@ -4041,12 +4048,16 @@ static int mvneta_config_rss(struct mvneta_port *pp) |
271 |
+ mvneta_percpu_elect(pp); |
272 |
+ spin_unlock(&pp->lock); |
273 |
+ |
274 |
+- /* We have to synchronise on the napi of each CPU */ |
275 |
+- for_each_online_cpu(cpu) { |
276 |
+- struct mvneta_pcpu_port *pcpu_port = |
277 |
+- per_cpu_ptr(pp->ports, cpu); |
278 |
++ if (!pp->neta_armada3700) { |
279 |
++ /* We have to synchronise on the napi of each CPU */ |
280 |
++ for_each_online_cpu(cpu) { |
281 |
++ struct mvneta_pcpu_port *pcpu_port = |
282 |
++ per_cpu_ptr(pp->ports, cpu); |
283 |
+ |
284 |
+- napi_enable(&pcpu_port->napi); |
285 |
++ napi_enable(&pcpu_port->napi); |
286 |
++ } |
287 |
++ } else { |
288 |
++ napi_enable(&pp->napi); |
289 |
+ } |
290 |
+ |
291 |
+ netif_tx_start_all_queues(pp->dev); |
292 |
+diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c |
293 |
+index eaedc11ed686..9ceb34bac3a9 100644 |
294 |
+--- a/drivers/net/ethernet/realtek/r8169.c |
295 |
++++ b/drivers/net/ethernet/realtek/r8169.c |
296 |
+@@ -7539,12 +7539,20 @@ static int rtl_alloc_irq(struct rtl8169_private *tp) |
297 |
+ { |
298 |
+ unsigned int flags; |
299 |
+ |
300 |
+- if (tp->mac_version <= RTL_GIGA_MAC_VER_06) { |
301 |
++ switch (tp->mac_version) { |
302 |
++ case RTL_GIGA_MAC_VER_01 ... RTL_GIGA_MAC_VER_06: |
303 |
+ RTL_W8(tp, Cfg9346, Cfg9346_Unlock); |
304 |
+ RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~MSIEnable); |
305 |
+ RTL_W8(tp, Cfg9346, Cfg9346_Lock); |
306 |
+ flags = PCI_IRQ_LEGACY; |
307 |
+- } else { |
308 |
++ break; |
309 |
++ case RTL_GIGA_MAC_VER_39 ... RTL_GIGA_MAC_VER_40: |
310 |
++ /* This version was reported to have issues with resume |
311 |
++ * from suspend when using MSI-X |
312 |
++ */ |
313 |
++ flags = PCI_IRQ_LEGACY | PCI_IRQ_MSI; |
314 |
++ break; |
315 |
++ default: |
316 |
+ flags = PCI_IRQ_ALL_TYPES; |
317 |
+ } |
318 |
+ |
319 |
+diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c |
320 |
+index 408ece27131c..2a5209f23f29 100644 |
321 |
+--- a/drivers/net/hyperv/rndis_filter.c |
322 |
++++ b/drivers/net/hyperv/rndis_filter.c |
323 |
+@@ -1338,7 +1338,7 @@ out: |
324 |
+ /* setting up multiple channels failed */ |
325 |
+ net_device->max_chn = 1; |
326 |
+ net_device->num_chn = 1; |
327 |
+- return 0; |
328 |
++ return net_device; |
329 |
+ |
330 |
+ err_dev_remv: |
331 |
+ rndis_filter_device_remove(dev, net_device); |
332 |
+diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c |
333 |
+index aff04f1de3a5..af842000188c 100644 |
334 |
+--- a/drivers/tty/serial/8250/8250_dw.c |
335 |
++++ b/drivers/tty/serial/8250/8250_dw.c |
336 |
+@@ -293,7 +293,7 @@ static void dw8250_set_termios(struct uart_port *p, struct ktermios *termios, |
337 |
+ long rate; |
338 |
+ int ret; |
339 |
+ |
340 |
+- if (IS_ERR(d->clk) || !old) |
341 |
++ if (IS_ERR(d->clk)) |
342 |
+ goto out; |
343 |
+ |
344 |
+ clk_disable_unprepare(d->clk); |
345 |
+@@ -707,6 +707,7 @@ static const struct acpi_device_id dw8250_acpi_match[] = { |
346 |
+ { "APMC0D08", 0}, |
347 |
+ { "AMD0020", 0 }, |
348 |
+ { "AMDI0020", 0 }, |
349 |
++ { "BRCM2032", 0 }, |
350 |
+ { "HISI0031", 0 }, |
351 |
+ { }, |
352 |
+ }; |
353 |
+diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c |
354 |
+index 38af306ca0e8..a951511f04cf 100644 |
355 |
+--- a/drivers/tty/serial/8250/8250_exar.c |
356 |
++++ b/drivers/tty/serial/8250/8250_exar.c |
357 |
+@@ -433,7 +433,11 @@ static irqreturn_t exar_misc_handler(int irq, void *data) |
358 |
+ struct exar8250 *priv = data; |
359 |
+ |
360 |
+ /* Clear all PCI interrupts by reading INT0. No effect on IIR */ |
361 |
+- ioread8(priv->virt + UART_EXAR_INT0); |
362 |
++ readb(priv->virt + UART_EXAR_INT0); |
363 |
++ |
364 |
++ /* Clear INT0 for Expansion Interface slave ports, too */ |
365 |
++ if (priv->board->num_ports > 8) |
366 |
++ readb(priv->virt + 0x2000 + UART_EXAR_INT0); |
367 |
+ |
368 |
+ return IRQ_HANDLED; |
369 |
+ } |
370 |
+diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c |
371 |
+index cf541aab2bd0..5cbc13e3d316 100644 |
372 |
+--- a/drivers/tty/serial/8250/8250_port.c |
373 |
++++ b/drivers/tty/serial/8250/8250_port.c |
374 |
+@@ -90,8 +90,7 @@ static const struct serial8250_config uart_config[] = { |
375 |
+ .name = "16550A", |
376 |
+ .fifo_size = 16, |
377 |
+ .tx_loadsz = 16, |
378 |
+- .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10 | |
379 |
+- UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT, |
380 |
++ .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, |
381 |
+ .rxtrig_bytes = {1, 4, 8, 14}, |
382 |
+ .flags = UART_CAP_FIFO, |
383 |
+ }, |
384 |
+diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c |
385 |
+index 5d421d7e8904..f68c1121fa7c 100644 |
386 |
+--- a/drivers/uio/uio.c |
387 |
++++ b/drivers/uio/uio.c |
388 |
+@@ -443,13 +443,10 @@ static irqreturn_t uio_interrupt(int irq, void *dev_id) |
389 |
+ struct uio_device *idev = (struct uio_device *)dev_id; |
390 |
+ irqreturn_t ret; |
391 |
+ |
392 |
+- mutex_lock(&idev->info_lock); |
393 |
+- |
394 |
+ ret = idev->info->handler(irq, idev->info); |
395 |
+ if (ret == IRQ_HANDLED) |
396 |
+ uio_event_notify(idev->info); |
397 |
+ |
398 |
+- mutex_unlock(&idev->info_lock); |
399 |
+ return ret; |
400 |
+ } |
401 |
+ |
402 |
+@@ -814,7 +811,7 @@ static int uio_mmap(struct file *filep, struct vm_area_struct *vma) |
403 |
+ |
404 |
+ out: |
405 |
+ mutex_unlock(&idev->info_lock); |
406 |
+- return 0; |
407 |
++ return ret; |
408 |
+ } |
409 |
+ |
410 |
+ static const struct file_operations uio_fops = { |
411 |
+@@ -969,9 +966,8 @@ int __uio_register_device(struct module *owner, |
412 |
+ * FDs at the time of unregister and therefore may not be |
413 |
+ * freed until they are released. |
414 |
+ */ |
415 |
+- ret = request_threaded_irq(info->irq, NULL, uio_interrupt, |
416 |
+- info->irq_flags, info->name, idev); |
417 |
+- |
418 |
++ ret = request_irq(info->irq, uio_interrupt, |
419 |
++ info->irq_flags, info->name, idev); |
420 |
+ if (ret) |
421 |
+ goto err_request_irq; |
422 |
+ } |
423 |
+diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c |
424 |
+index 664e61f16b6a..0215b70c4efc 100644 |
425 |
+--- a/drivers/usb/serial/option.c |
426 |
++++ b/drivers/usb/serial/option.c |
427 |
+@@ -196,6 +196,8 @@ static void option_instat_callback(struct urb *urb); |
428 |
+ #define DELL_PRODUCT_5800_V2_MINICARD_VZW 0x8196 /* Novatel E362 */ |
429 |
+ #define DELL_PRODUCT_5804_MINICARD_ATT 0x819b /* Novatel E371 */ |
430 |
+ |
431 |
++#define DELL_PRODUCT_5821E 0x81d7 |
432 |
++ |
433 |
+ #define KYOCERA_VENDOR_ID 0x0c88 |
434 |
+ #define KYOCERA_PRODUCT_KPC650 0x17da |
435 |
+ #define KYOCERA_PRODUCT_KPC680 0x180a |
436 |
+@@ -1030,6 +1032,8 @@ static const struct usb_device_id option_ids[] = { |
437 |
+ { USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, DELL_PRODUCT_5800_MINICARD_VZW, 0xff, 0xff, 0xff) }, |
438 |
+ { USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, DELL_PRODUCT_5800_V2_MINICARD_VZW, 0xff, 0xff, 0xff) }, |
439 |
+ { USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, DELL_PRODUCT_5804_MINICARD_ATT, 0xff, 0xff, 0xff) }, |
440 |
++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5821E), |
441 |
++ .driver_info = RSVD(0) | RSVD(1) | RSVD(6) }, |
442 |
+ { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, /* ADU-E100, ADU-310 */ |
443 |
+ { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) }, |
444 |
+ { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) }, |
445 |
+diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c |
446 |
+index 5d1a1931967e..e41f725ac7aa 100644 |
447 |
+--- a/drivers/usb/serial/pl2303.c |
448 |
++++ b/drivers/usb/serial/pl2303.c |
449 |
+@@ -52,6 +52,8 @@ static const struct usb_device_id id_table[] = { |
450 |
+ .driver_info = PL2303_QUIRK_ENDPOINT_HACK }, |
451 |
+ { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_UC485), |
452 |
+ .driver_info = PL2303_QUIRK_ENDPOINT_HACK }, |
453 |
++ { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_UC232B), |
454 |
++ .driver_info = PL2303_QUIRK_ENDPOINT_HACK }, |
455 |
+ { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID2) }, |
456 |
+ { USB_DEVICE(ATEN_VENDOR_ID2, ATEN_PRODUCT_ID) }, |
457 |
+ { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID) }, |
458 |
+diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h |
459 |
+index fcd72396a7b6..26965cc23c17 100644 |
460 |
+--- a/drivers/usb/serial/pl2303.h |
461 |
++++ b/drivers/usb/serial/pl2303.h |
462 |
+@@ -24,6 +24,7 @@ |
463 |
+ #define ATEN_VENDOR_ID2 0x0547 |
464 |
+ #define ATEN_PRODUCT_ID 0x2008 |
465 |
+ #define ATEN_PRODUCT_UC485 0x2021 |
466 |
++#define ATEN_PRODUCT_UC232B 0x2022 |
467 |
+ #define ATEN_PRODUCT_ID2 0x2118 |
468 |
+ |
469 |
+ #define IODATA_VENDOR_ID 0x04bb |
470 |
+diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c |
471 |
+index d189f953c891..55956a638f5b 100644 |
472 |
+--- a/drivers/usb/serial/sierra.c |
473 |
++++ b/drivers/usb/serial/sierra.c |
474 |
+@@ -770,9 +770,9 @@ static void sierra_close(struct usb_serial_port *port) |
475 |
+ kfree(urb->transfer_buffer); |
476 |
+ usb_free_urb(urb); |
477 |
+ usb_autopm_put_interface_async(serial->interface); |
478 |
+- spin_lock(&portdata->lock); |
479 |
++ spin_lock_irq(&portdata->lock); |
480 |
+ portdata->outstanding_urbs--; |
481 |
+- spin_unlock(&portdata->lock); |
482 |
++ spin_unlock_irq(&portdata->lock); |
483 |
+ } |
484 |
+ |
485 |
+ sierra_stop_rx_urbs(port); |
486 |
+diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c |
487 |
+index 413b8ee49fec..8f0f9279eac9 100644 |
488 |
+--- a/net/bluetooth/sco.c |
489 |
++++ b/net/bluetooth/sco.c |
490 |
+@@ -393,7 +393,8 @@ static void sco_sock_cleanup_listen(struct sock *parent) |
491 |
+ */ |
492 |
+ static void sco_sock_kill(struct sock *sk) |
493 |
+ { |
494 |
+- if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket) |
495 |
++ if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket || |
496 |
++ sock_flag(sk, SOCK_DEAD)) |
497 |
+ return; |
498 |
+ |
499 |
+ BT_DBG("sk %p state %d", sk, sk->sk_state); |
500 |
+diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c |
501 |
+index c37b5be7c5e4..3312a5849a97 100644 |
502 |
+--- a/net/core/sock_diag.c |
503 |
++++ b/net/core/sock_diag.c |
504 |
+@@ -10,6 +10,7 @@ |
505 |
+ #include <linux/kernel.h> |
506 |
+ #include <linux/tcp.h> |
507 |
+ #include <linux/workqueue.h> |
508 |
++#include <linux/nospec.h> |
509 |
+ |
510 |
+ #include <linux/inet_diag.h> |
511 |
+ #include <linux/sock_diag.h> |
512 |
+@@ -218,6 +219,7 @@ static int __sock_diag_cmd(struct sk_buff *skb, struct nlmsghdr *nlh) |
513 |
+ |
514 |
+ if (req->sdiag_family >= AF_MAX) |
515 |
+ return -EINVAL; |
516 |
++ req->sdiag_family = array_index_nospec(req->sdiag_family, AF_MAX); |
517 |
+ |
518 |
+ if (sock_diag_handlers[req->sdiag_family] == NULL) |
519 |
+ sock_load_diag_module(req->sdiag_family, 0); |
520 |
+diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c |
521 |
+index 3f091ccad9af..f38cb21d773d 100644 |
522 |
+--- a/net/ipv4/ip_vti.c |
523 |
++++ b/net/ipv4/ip_vti.c |
524 |
+@@ -438,7 +438,8 @@ static int __net_init vti_init_net(struct net *net) |
525 |
+ if (err) |
526 |
+ return err; |
527 |
+ itn = net_generic(net, vti_net_id); |
528 |
+- vti_fb_tunnel_init(itn->fb_tunnel_dev); |
529 |
++ if (itn->fb_tunnel_dev) |
530 |
++ vti_fb_tunnel_init(itn->fb_tunnel_dev); |
531 |
+ return 0; |
532 |
+ } |
533 |
+ |
534 |
+diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c |
535 |
+index 40261cb68e83..8aaf8157da2b 100644 |
536 |
+--- a/net/l2tp/l2tp_core.c |
537 |
++++ b/net/l2tp/l2tp_core.c |
538 |
+@@ -1110,7 +1110,7 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len |
539 |
+ |
540 |
+ /* Get routing info from the tunnel socket */ |
541 |
+ skb_dst_drop(skb); |
542 |
+- skb_dst_set(skb, dst_clone(__sk_dst_check(sk, 0))); |
543 |
++ skb_dst_set(skb, sk_dst_check(sk, 0)); |
544 |
+ |
545 |
+ inet = inet_sk(sk); |
546 |
+ fl = &inet->cork.fl; |
547 |
+diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c |
548 |
+index 47b207ef7762..7ad65daf66a4 100644 |
549 |
+--- a/net/sched/cls_matchall.c |
550 |
++++ b/net/sched/cls_matchall.c |
551 |
+@@ -111,6 +111,8 @@ static void mall_destroy(struct tcf_proto *tp, struct netlink_ext_ack *extack) |
552 |
+ if (!head) |
553 |
+ return; |
554 |
+ |
555 |
++ tcf_unbind_filter(tp, &head->res); |
556 |
++ |
557 |
+ if (!tc_skip_hw(head->flags)) |
558 |
+ mall_destroy_hw_filter(tp, head, (unsigned long) head, extack); |
559 |
+ |
560 |
+diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c |
561 |
+index 32f4bbd82f35..9ccc93f257db 100644 |
562 |
+--- a/net/sched/cls_tcindex.c |
563 |
++++ b/net/sched/cls_tcindex.c |
564 |
+@@ -447,11 +447,6 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, |
565 |
+ tcf_bind_filter(tp, &cr.res, base); |
566 |
+ } |
567 |
+ |
568 |
+- if (old_r) |
569 |
+- tcf_exts_change(&r->exts, &e); |
570 |
+- else |
571 |
+- tcf_exts_change(&cr.exts, &e); |
572 |
+- |
573 |
+ if (old_r && old_r != r) { |
574 |
+ err = tcindex_filter_result_init(old_r); |
575 |
+ if (err < 0) { |
576 |
+@@ -462,12 +457,15 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, |
577 |
+ |
578 |
+ oldp = p; |
579 |
+ r->res = cr.res; |
580 |
++ tcf_exts_change(&r->exts, &e); |
581 |
++ |
582 |
+ rcu_assign_pointer(tp->root, cp); |
583 |
+ |
584 |
+ if (r == &new_filter_result) { |
585 |
+ struct tcindex_filter *nfp; |
586 |
+ struct tcindex_filter __rcu **fp; |
587 |
+ |
588 |
++ f->result.res = r->res; |
589 |
+ tcf_exts_change(&f->result.exts, &r->exts); |
590 |
+ |
591 |
+ fp = cp->h + (handle % cp->hash); |
592 |
+diff --git a/net/socket.c b/net/socket.c |
593 |
+index 8c24d5dc4bc8..4ac3b834cce9 100644 |
594 |
+--- a/net/socket.c |
595 |
++++ b/net/socket.c |
596 |
+@@ -2690,8 +2690,7 @@ EXPORT_SYMBOL(sock_unregister); |
597 |
+ |
598 |
+ bool sock_is_registered(int family) |
599 |
+ { |
600 |
+- return family < NPROTO && |
601 |
+- rcu_access_pointer(net_families[array_index_nospec(family, NPROTO)]); |
602 |
++ return family < NPROTO && rcu_access_pointer(net_families[family]); |
603 |
+ } |
604 |
+ |
605 |
+ static int __init sock_init(void) |
606 |
+diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c |
607 |
+index 7f89d3c79a4b..753d5fc4b284 100644 |
608 |
+--- a/sound/core/memalloc.c |
609 |
++++ b/sound/core/memalloc.c |
610 |
+@@ -242,16 +242,12 @@ int snd_dma_alloc_pages_fallback(int type, struct device *device, size_t size, |
611 |
+ int err; |
612 |
+ |
613 |
+ while ((err = snd_dma_alloc_pages(type, device, size, dmab)) < 0) { |
614 |
+- size_t aligned_size; |
615 |
+ if (err != -ENOMEM) |
616 |
+ return err; |
617 |
+ if (size <= PAGE_SIZE) |
618 |
+ return -ENOMEM; |
619 |
+- aligned_size = PAGE_SIZE << get_order(size); |
620 |
+- if (size != aligned_size) |
621 |
+- size = aligned_size; |
622 |
+- else |
623 |
+- size >>= 1; |
624 |
++ size >>= 1; |
625 |
++ size = PAGE_SIZE << get_order(size); |
626 |
+ } |
627 |
+ if (! dmab->area) |
628 |
+ return -ENOMEM; |
629 |
+diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c |
630 |
+index 5f64d0d88320..e1f44fc86885 100644 |
631 |
+--- a/sound/core/seq/oss/seq_oss.c |
632 |
++++ b/sound/core/seq/oss/seq_oss.c |
633 |
+@@ -203,7 +203,7 @@ odev_poll(struct file *file, poll_table * wait) |
634 |
+ struct seq_oss_devinfo *dp; |
635 |
+ dp = file->private_data; |
636 |
+ if (snd_BUG_ON(!dp)) |
637 |
+- return -ENXIO; |
638 |
++ return EPOLLERR; |
639 |
+ return snd_seq_oss_poll(dp, file, wait); |
640 |
+ } |
641 |
+ |
642 |
+diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c |
643 |
+index 56ca78423040..6fd4b074b206 100644 |
644 |
+--- a/sound/core/seq/seq_clientmgr.c |
645 |
++++ b/sound/core/seq/seq_clientmgr.c |
646 |
+@@ -1101,7 +1101,7 @@ static __poll_t snd_seq_poll(struct file *file, poll_table * wait) |
647 |
+ |
648 |
+ /* check client structures are in place */ |
649 |
+ if (snd_BUG_ON(!client)) |
650 |
+- return -ENXIO; |
651 |
++ return EPOLLERR; |
652 |
+ |
653 |
+ if ((snd_seq_file_flags(file) & SNDRV_SEQ_LFLG_INPUT) && |
654 |
+ client->data.user.fifo) { |
655 |
+diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c |
656 |
+index 289ae6bb81d9..8ebbca554e99 100644 |
657 |
+--- a/sound/core/seq/seq_virmidi.c |
658 |
++++ b/sound/core/seq/seq_virmidi.c |
659 |
+@@ -163,6 +163,7 @@ static void snd_virmidi_output_trigger(struct snd_rawmidi_substream *substream, |
660 |
+ int count, res; |
661 |
+ unsigned char buf[32], *pbuf; |
662 |
+ unsigned long flags; |
663 |
++ bool check_resched = !in_atomic(); |
664 |
+ |
665 |
+ if (up) { |
666 |
+ vmidi->trigger = 1; |
667 |
+@@ -200,6 +201,15 @@ static void snd_virmidi_output_trigger(struct snd_rawmidi_substream *substream, |
668 |
+ vmidi->event.type = SNDRV_SEQ_EVENT_NONE; |
669 |
+ } |
670 |
+ } |
671 |
++ if (!check_resched) |
672 |
++ continue; |
673 |
++ /* do temporary unlock & cond_resched() for avoiding |
674 |
++ * CPU soft lockup, which may happen via a write from |
675 |
++ * a huge rawmidi buffer |
676 |
++ */ |
677 |
++ spin_unlock_irqrestore(&substream->runtime->lock, flags); |
678 |
++ cond_resched(); |
679 |
++ spin_lock_irqsave(&substream->runtime->lock, flags); |
680 |
+ } |
681 |
+ out: |
682 |
+ spin_unlock_irqrestore(&substream->runtime->lock, flags); |
683 |
+diff --git a/sound/firewire/dice/dice-alesis.c b/sound/firewire/dice/dice-alesis.c |
684 |
+index b2efb1c71a98..218292bdace6 100644 |
685 |
+--- a/sound/firewire/dice/dice-alesis.c |
686 |
++++ b/sound/firewire/dice/dice-alesis.c |
687 |
+@@ -37,7 +37,7 @@ int snd_dice_detect_alesis_formats(struct snd_dice *dice) |
688 |
+ MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * |
689 |
+ sizeof(unsigned int)); |
690 |
+ } else { |
691 |
+- memcpy(dice->rx_pcm_chs, alesis_io26_tx_pcm_chs, |
692 |
++ memcpy(dice->tx_pcm_chs, alesis_io26_tx_pcm_chs, |
693 |
+ MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * |
694 |
+ sizeof(unsigned int)); |
695 |
+ } |
696 |
+diff --git a/sound/pci/cs5535audio/cs5535audio.h b/sound/pci/cs5535audio/cs5535audio.h |
697 |
+index f4fcdf93f3c8..d84620a0c26c 100644 |
698 |
+--- a/sound/pci/cs5535audio/cs5535audio.h |
699 |
++++ b/sound/pci/cs5535audio/cs5535audio.h |
700 |
+@@ -67,9 +67,9 @@ struct cs5535audio_dma_ops { |
701 |
+ }; |
702 |
+ |
703 |
+ struct cs5535audio_dma_desc { |
704 |
+- u32 addr; |
705 |
+- u16 size; |
706 |
+- u16 ctlreserved; |
707 |
++ __le32 addr; |
708 |
++ __le16 size; |
709 |
++ __le16 ctlreserved; |
710 |
+ }; |
711 |
+ |
712 |
+ struct cs5535audio_dma { |
713 |
+diff --git a/sound/pci/cs5535audio/cs5535audio_pcm.c b/sound/pci/cs5535audio/cs5535audio_pcm.c |
714 |
+index ee7065f6e162..326caec854e1 100644 |
715 |
+--- a/sound/pci/cs5535audio/cs5535audio_pcm.c |
716 |
++++ b/sound/pci/cs5535audio/cs5535audio_pcm.c |
717 |
+@@ -158,8 +158,8 @@ static int cs5535audio_build_dma_packets(struct cs5535audio *cs5535au, |
718 |
+ lastdesc->addr = cpu_to_le32((u32) dma->desc_buf.addr); |
719 |
+ lastdesc->size = 0; |
720 |
+ lastdesc->ctlreserved = cpu_to_le16(PRD_JMP); |
721 |
+- jmpprd_addr = cpu_to_le32(lastdesc->addr + |
722 |
+- (sizeof(struct cs5535audio_dma_desc)*periods)); |
723 |
++ jmpprd_addr = (u32)dma->desc_buf.addr + |
724 |
++ sizeof(struct cs5535audio_dma_desc) * periods; |
725 |
+ |
726 |
+ dma->substream = substream; |
727 |
+ dma->period_bytes = period_bytes; |
728 |
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c |
729 |
+index 1ae1850b3bfd..647ae1a71e10 100644 |
730 |
+--- a/sound/pci/hda/hda_intel.c |
731 |
++++ b/sound/pci/hda/hda_intel.c |
732 |
+@@ -2207,7 +2207,7 @@ out_free: |
733 |
+ */ |
734 |
+ static struct snd_pci_quirk power_save_blacklist[] = { |
735 |
+ /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */ |
736 |
+- SND_PCI_QUIRK(0x1849, 0x0c0c, "Asrock B85M-ITX", 0), |
737 |
++ SND_PCI_QUIRK(0x1849, 0xc892, "Asrock B85M-ITX", 0), |
738 |
+ /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */ |
739 |
+ SND_PCI_QUIRK(0x1849, 0x7662, "Asrock H81M-HDS", 0), |
740 |
+ /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */ |
741 |
+diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c |
742 |
+index f641c20095f7..1a8a2d440fbd 100644 |
743 |
+--- a/sound/pci/hda/patch_conexant.c |
744 |
++++ b/sound/pci/hda/patch_conexant.c |
745 |
+@@ -211,6 +211,7 @@ static void cx_auto_reboot_notify(struct hda_codec *codec) |
746 |
+ struct conexant_spec *spec = codec->spec; |
747 |
+ |
748 |
+ switch (codec->core.vendor_id) { |
749 |
++ case 0x14f12008: /* CX8200 */ |
750 |
+ case 0x14f150f2: /* CX20722 */ |
751 |
+ case 0x14f150f4: /* CX20724 */ |
752 |
+ break; |
753 |
+@@ -218,13 +219,14 @@ static void cx_auto_reboot_notify(struct hda_codec *codec) |
754 |
+ return; |
755 |
+ } |
756 |
+ |
757 |
+- /* Turn the CX20722 codec into D3 to avoid spurious noises |
758 |
++ /* Turn the problematic codec into D3 to avoid spurious noises |
759 |
+ from the internal speaker during (and after) reboot */ |
760 |
+ cx_auto_turn_eapd(codec, spec->num_eapds, spec->eapds, false); |
761 |
+ |
762 |
+ snd_hda_codec_set_power_to_all(codec, codec->core.afg, AC_PWRST_D3); |
763 |
+ snd_hda_codec_write(codec, codec->core.afg, 0, |
764 |
+ AC_VERB_SET_POWER_STATE, AC_PWRST_D3); |
765 |
++ msleep(10); |
766 |
+ } |
767 |
+ |
768 |
+ static void cx_auto_free(struct hda_codec *codec) |
769 |
+diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c |
770 |
+index d4298af6d3ee..c0d0bf44f365 100644 |
771 |
+--- a/sound/pci/vx222/vx222_ops.c |
772 |
++++ b/sound/pci/vx222/vx222_ops.c |
773 |
+@@ -275,7 +275,7 @@ static void vx2_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
774 |
+ length >>= 2; /* in 32bit words */ |
775 |
+ /* Transfer using pseudo-dma. */ |
776 |
+ for (; length > 0; length--) { |
777 |
+- outl(cpu_to_le32(*addr), port); |
778 |
++ outl(*addr, port); |
779 |
+ addr++; |
780 |
+ } |
781 |
+ addr = (u32 *)runtime->dma_area; |
782 |
+@@ -285,7 +285,7 @@ static void vx2_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
783 |
+ count >>= 2; /* in 32bit words */ |
784 |
+ /* Transfer using pseudo-dma. */ |
785 |
+ for (; count > 0; count--) { |
786 |
+- outl(cpu_to_le32(*addr), port); |
787 |
++ outl(*addr, port); |
788 |
+ addr++; |
789 |
+ } |
790 |
+ |
791 |
+@@ -313,7 +313,7 @@ static void vx2_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
792 |
+ length >>= 2; /* in 32bit words */ |
793 |
+ /* Transfer using pseudo-dma. */ |
794 |
+ for (; length > 0; length--) |
795 |
+- *addr++ = le32_to_cpu(inl(port)); |
796 |
++ *addr++ = inl(port); |
797 |
+ addr = (u32 *)runtime->dma_area; |
798 |
+ pipe->hw_ptr = 0; |
799 |
+ } |
800 |
+@@ -321,7 +321,7 @@ static void vx2_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
801 |
+ count >>= 2; /* in 32bit words */ |
802 |
+ /* Transfer using pseudo-dma. */ |
803 |
+ for (; count > 0; count--) |
804 |
+- *addr++ = le32_to_cpu(inl(port)); |
805 |
++ *addr++ = inl(port); |
806 |
+ |
807 |
+ vx2_release_pseudo_dma(chip); |
808 |
+ } |
809 |
+diff --git a/sound/pcmcia/vx/vxp_ops.c b/sound/pcmcia/vx/vxp_ops.c |
810 |
+index 8cde40226355..4c4ef1fec69f 100644 |
811 |
+--- a/sound/pcmcia/vx/vxp_ops.c |
812 |
++++ b/sound/pcmcia/vx/vxp_ops.c |
813 |
+@@ -375,7 +375,7 @@ static void vxp_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
814 |
+ length >>= 1; /* in 16bit words */ |
815 |
+ /* Transfer using pseudo-dma. */ |
816 |
+ for (; length > 0; length--) { |
817 |
+- outw(cpu_to_le16(*addr), port); |
818 |
++ outw(*addr, port); |
819 |
+ addr++; |
820 |
+ } |
821 |
+ addr = (unsigned short *)runtime->dma_area; |
822 |
+@@ -385,7 +385,7 @@ static void vxp_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
823 |
+ count >>= 1; /* in 16bit words */ |
824 |
+ /* Transfer using pseudo-dma. */ |
825 |
+ for (; count > 0; count--) { |
826 |
+- outw(cpu_to_le16(*addr), port); |
827 |
++ outw(*addr, port); |
828 |
+ addr++; |
829 |
+ } |
830 |
+ vx_release_pseudo_dma(chip); |
831 |
+@@ -417,7 +417,7 @@ static void vxp_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
832 |
+ length >>= 1; /* in 16bit words */ |
833 |
+ /* Transfer using pseudo-dma. */ |
834 |
+ for (; length > 0; length--) |
835 |
+- *addr++ = le16_to_cpu(inw(port)); |
836 |
++ *addr++ = inw(port); |
837 |
+ addr = (unsigned short *)runtime->dma_area; |
838 |
+ pipe->hw_ptr = 0; |
839 |
+ } |
840 |
+@@ -425,12 +425,12 @@ static void vxp_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, |
841 |
+ count >>= 1; /* in 16bit words */ |
842 |
+ /* Transfer using pseudo-dma. */ |
843 |
+ for (; count > 1; count--) |
844 |
+- *addr++ = le16_to_cpu(inw(port)); |
845 |
++ *addr++ = inw(port); |
846 |
+ /* Disable DMA */ |
847 |
+ pchip->regDIALOG &= ~VXP_DLG_DMAREAD_SEL_MASK; |
848 |
+ vx_outb(chip, DIALOG, pchip->regDIALOG); |
849 |
+ /* Read the last word (16 bits) */ |
850 |
+- *addr = le16_to_cpu(inw(port)); |
851 |
++ *addr = inw(port); |
852 |
+ /* Disable 16-bit accesses */ |
853 |
+ pchip->regDIALOG &= ~VXP_DLG_DMA16_SEL_MASK; |
854 |
+ vx_outb(chip, DIALOG, pchip->regDIALOG); |