lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 26 May 2015 16:25:58 +0300 From: Peter Ujfalusi <peter.ujfalusi@...com> To: <vinod.koul@...el.com>, <tony@...mide.com> CC: <devicetree@...r.kernel.org>, <linux-kernel@...r.kernel.org>, <dan.j.williams@...el.com>, <dmaengine@...r.kernel.org>, <linux-serial@...r.kernel.org>, <linux-omap@...r.kernel.org>, <linux-mmc@...r.kernel.org>, <linux-crypto@...r.kernel.org>, <linux-spi@...r.kernel.org>, <linux-media@...r.kernel.org>, <alsa-devel@...a-project.org>, Greg Kroah-Hartman <gregkh@...uxfoundation.org> Subject: [PATCH 03/13] serial: 8250_dma: Support for deferred probing when requesting DMA channels Switch to use ma_request_slave_channel_compat_reason() to request the DMA channels. In case of error, return the error code we received including -EPROBE_DEFER Signed-off-by: Peter Ujfalusi <peter.ujfalusi@...com> CC: Greg Kroah-Hartman <gregkh@...uxfoundation.org> --- drivers/tty/serial/8250/8250_dma.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c index 21d01a491405..a617eca4e97d 100644 --- a/drivers/tty/serial/8250/8250_dma.c +++ b/drivers/tty/serial/8250/8250_dma.c @@ -182,21 +182,19 @@ int serial8250_request_dma(struct uart_8250_port *p) dma_cap_set(DMA_SLAVE, mask); /* Get a channel for RX */ - dma->rxchan = dma_request_slave_channel_compat(mask, - dma->fn, dma->rx_param, - p->port.dev, "rx"); - if (!dma->rxchan) - return -ENODEV; + dma->rxchan = dma_request_slave_channel_compat_reason(mask, dma->fn, + dma->rx_param, p->port.dev, "rx"); + if (IS_ERR(dma->rxchan)) + return PTR_ERR(dma->rxchan); dmaengine_slave_config(dma->rxchan, &dma->rxconf); /* Get a channel for TX */ - dma->txchan = dma_request_slave_channel_compat(mask, - dma->fn, dma->tx_param, - p->port.dev, "tx"); - if (!dma->txchan) { + dma->txchan = dma_request_slave_channel_compat_reason(mask, dma->fn, + dma->tx_param, p->port.dev, "tx"); + if (IS_ERR(dma->txchan)) { dma_release_channel(dma->rxchan); - return -ENODEV; + return PTR_ERR(dma->txchan); } dmaengine_slave_config(dma->txchan, &dma->txconf); -- 2.3.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists