From 421593c720e900283ff244d170d55df346c404af Mon Sep 17 00:00:00 2001 From: Erik Gilling Date: Wed, 1 Sep 2010 13:43:43 -0700 Subject: [PATCH] [ARM] serial: update tegra_hsuart to use PTR_ERRless dma API Change-Id: I071d99032995c878bc1d563cda56602f5410ab43 Signed-off-by: Erik Gilling --- drivers/serial/tegra_hsuart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/serial/tegra_hsuart.c b/drivers/serial/tegra_hsuart.c index 0341aa55a957..cd4de24065fa 100644 --- a/drivers/serial/tegra_hsuart.c +++ b/drivers/serial/tegra_hsuart.c @@ -666,7 +666,7 @@ static int tegra_uart_init_rx_dma(struct tegra_uart_port *t) void *rx_dma_virt; t->rx_dma = tegra_dma_allocate_channel(TEGRA_DMA_MODE_CONTINOUS); - if (IS_ERR_OR_NULL(t->rx_dma)) + if (!t->rx_dma) return -ENODEV; memset(&t->rx_dma_req, 0, sizeof(t->rx_dma_req)); @@ -710,7 +710,7 @@ static int tegra_startup(struct uart_port *u) t->use_tx_dma = false; if (!TX_FORCE_PIO) { t->tx_dma = tegra_dma_allocate_channel(TEGRA_DMA_MODE_ONESHOT); - if (!IS_ERR_OR_NULL(t->tx_dma)) + if (t->tx_dma) t->use_tx_dma = true; } if (t->use_tx_dma) { -- 2.34.1