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

Commit 53d454a1 authored by Brian Niebuhr's avatar Brian Niebuhr Committed by Sekhar Nori
Browse files

spi: davinci: check for NULL buffer pointer before using it 



In the davinci_spi_{tx|rx}_u{8|16}() functions, check for
buffer pointer being valid before using it. While providing
for better error checking, this change will help simplify
code in the caller.

Signed-off-by: default avatarBrian Niebuhr <bniebuhr@efjohnson.com>
Tested-By: default avatarMichael Williamson <michael.williamson@criticallink.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent b7ab24a0

drivers/spi/davinci_spi.c

+22 −18
Original line number Diff line number Diff line
@@ -158,37 +158,41 @@ static unsigned use_dma; 


static void davinci_spi_rx_buf_u8(u32 data, struct davinci_spi *davinci_spi)

{

	if (davinci_spi->rx) {

		u8 *rx = davinci_spi->rx;



		*rx++ = (u8)data;

		davinci_spi->rx = rx;

	}

}



static void davinci_spi_rx_buf_u16(u32 data, struct davinci_spi *davinci_spi)

{

	if (davinci_spi->rx) {

		u16 *rx = davinci_spi->rx;



		*rx++ = (u16)data;

		davinci_spi->rx = rx;

	}

}



static u32 davinci_spi_tx_buf_u8(struct davinci_spi *davinci_spi)

{

	u32 data;

	u32 data = 0;

	if (davinci_spi->tx) {

		const u8 *tx = davinci_spi->tx;



		data = *tx++;

		davinci_spi->tx = tx;

	}

	return data;

}



static u32 davinci_spi_tx_buf_u16(struct davinci_spi *davinci_spi)

{

	u32 data;

	u32 data = 0;

	if (davinci_spi->tx) {

		const u16 *tx = davinci_spi->tx;



		data = *tx++;

		davinci_spi->tx = tx;

	}

	return data;

}