tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Mark Brown 3ee20abb c23663ac

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