Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 325694e6 authored by Rahul Lakkireddy's avatar Rahul Lakkireddy Committed by David S. Miller
Browse files

cxgb4: properly initialize variables 



memset variables to 0 to fix sparse warnings:

drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c:409:42: sparse: Using
plain integer as NULL pointer

drivers/net/ethernet/chelsio/cxgb4/cudbg_zlib.c:43:47: sparse: Using
plain integer as NULL pointer

Fixes: ad75b7d3 ("cxgb4: implement ethtool dump data operations")
Fixes: 91c1953d ("cxgb4: use zlib deflate to compress firmware dump")
Signed-off-by: default avatarRahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: default avatarGanesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a1cf9c9f

drivers/net/ethernet/chelsio/cxgb4/cudbg_zlib.c

+2 −1
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ int cudbg_compress_buff(struct cudbg_init *pdbg_init, 
			struct cudbg_buffer *pin_buff,

			struct cudbg_buffer *pout_buff)

{

	struct z_stream_s compress_stream = { 0 };

	struct cudbg_buffer temp_buff = { 0 };

	struct z_stream_s compress_stream;

	struct cudbg_compress_hdr *c_hdr;

	int rc;
@@ -53,6 +53,7 @@ int cudbg_compress_buff(struct cudbg_init *pdbg_init, 
	c_hdr = (struct cudbg_compress_hdr *)temp_buff.data;

	c_hdr->compress_id = CUDBG_ZLIB_COMPRESS_ID;



	memset(&compress_stream, 0, sizeof(struct z_stream_s));

	compress_stream.workspace = pdbg_init->workspace;

	rc = zlib_deflateInit2(&compress_stream, Z_DEFAULT_COMPRESSION,

			       Z_DEFLATED, CUDBG_ZLIB_WIN_BITS,

drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c

+2 −1
Original line number Diff line number Diff line
@@ -406,14 +406,15 @@ static void cudbg_free_compress_buff(struct cudbg_init *pdbg_init) 
int cxgb4_cudbg_collect(struct adapter *adap, void *buf, u32 *buf_size,

			u32 flag)

{

	struct cudbg_init cudbg_init = { 0 };

	struct cudbg_buffer dbg_buff = { 0 };

	u32 size, min_size, total_size = 0;

	struct cudbg_init cudbg_init;

	struct cudbg_hdr *cudbg_hdr;

	int rc;



	size = *buf_size;



	memset(&cudbg_init, 0, sizeof(struct cudbg_init));

	cudbg_init.adap = adap;

	cudbg_init.outbuf = buf;

	cudbg_init.outbuf_size = size;