1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index c0743604b906..cd0e08b0c9f6 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -499,7 +499,7 @@ static void rockchip_spi_config(struct rockchip_spi *rs)
         }
 
         /* div doesn't support odd number */
-        div = rs->max_freq / rs->speed;
+        div = max_t(u32, rs->max_freq / rs->speed, 1);
         div = (div + 1) & 0xfffe;
 
         spi_enable_chip(rs, 0);
@@ -678,7 +678,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
                 rs->dma_tx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_TXDR);
                 rs->dma_rx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_RXDR);
                 rs->dma_tx.direction = DMA_MEM_TO_DEV;
-                rs->dma_tx.direction = DMA_DEV_TO_MEM;
+                rs->dma_rx.direction = DMA_DEV_TO_MEM;
 
                 master->can_dma = rockchip_spi_can_dma;
                 master->dma_tx = rs->dma_tx.ch;