Commit 3e14592d authored Mar 07, 2019 by Nathan Chancellor Committed by Martin K. Petersen Mar 25, 2019

scsi: gdth: Only call dma_free_coherent when buf is not NULL in ioc_general

When building with -Wsometimes-uninitialized, Clang warns:

drivers/scsi/gdth.c:3662:6: warning: variable 'paddr' is used
uninitialized whenever 'if' condition is false
[-Wsometimes-uninitialized]

Don't attempt to call dma_free_coherent when buf is NULL (meaning that
we never called dma_alloc_coherent and initialized paddr), which avoids
this warning.

Link: https://github.com/ClangBuiltLinux/linux/issues/402


Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent a4b207de

drivers/scsi/gdth.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -3697,8 +3697,9 @@ static int ioc_general(void __user arg, char cmnd)

		rval = 0;
		out_free_buf:
		dma_free_coherent(&ha->pdev->dev, gen.data_len + gen.sense_len, buf,
		paddr);
		if (buf)
		dma_free_coherent(&ha->pdev->dev, gen.data_len + gen.sense_len,
		buf, paddr);
		return rval;
		}

Admin message