Merge tag ‘dmaengine-fix-5.1-rc7’ of git://git.infradead.org/users/vkoul/slave-dma [Linux 5.1]

Merge tag ‘dmaengine-fix-5.1-rc7’ of git://git.infradead.org/users/vkoul/slave-dma [Linux 5.1]

This Linux kernel change "Merge tag ‘dmaengine-fix-5.1-rc7’ of git://git.infradead.org/users/vkoul/slave-dma" is included in the Linux 5.1 release. This change is authored by Linus Torvalds <torvalds [at] linux-foundation.org> on Sun Apr 28 09:45:18 2019 -0700. The commit for this change in Linux stable tree is 72a6e35 (patch). Other info about this change: Merge: 25cce03 5bb5c3a

Merge tag 'dmaengine-fix-5.1-rc7' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine fixes from Vinod Koul:

 - fix for wrong register use in mediatek driver

 - fix in sh driver for glitch is tx_status and treating 0 a valid
   residue for cyclic

 - fix in bcm driver for using right memory allocation flag

* tag 'dmaengine-fix-5.1-rc7' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: mediatek-cqdma: fix wrong register usage in mtk_cqdma_start
  dmaengine: sh: rcar-dmac: Fix glitch in dmaengine_tx_status
  dmaengine: sh: rcar-dmac: With cyclic DMA residue 0 is valid
  dmaengine: bcm2835: Avoid GFP_KERNEL in device_prep_slave_sg

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/slip/slhc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
index f4e93f5..ea90db3 100644
--- a/drivers/net/slip/slhc.c
+++ b/drivers/net/slip/slhc.c
@@ -153,7 +153,7 @@ struct slcompress *
 void
 slhc_free(struct slcompress *comp)
 {
-   if ( comp == NULLSLCOMPR )
+   if ( IS_ERR_OR_NULL(comp) )
        return;

    if ( comp->tstate != NULLSLSTATE )

Leave a Reply

Your email address will not be published. Required fields are marked *