Merge remote-tracking branch 'spi/fix/rockchip' into spi-linus

+3
+3
drivers/spi/spi-rockchip.c
··· 749 749 return 0; 750 750 751 751 err_register_master: 752 + pm_runtime_disable(&pdev->dev); 752 753 if (rs->dma_tx.ch) 753 754 dma_release_channel(rs->dma_tx.ch); 754 755 if (rs->dma_rx.ch) ··· 778 777 dma_release_channel(rs->dma_tx.ch); 779 778 if (rs->dma_rx.ch) 780 779 dma_release_channel(rs->dma_rx.ch); 780 + 781 + spi_master_put(master); 781 782 782 783 return 0; 783 784 }