diff mbox

spi: spi.c: Provide cast to avoid warning

Message ID 1355106738-14191-1-git-send-email-festevam@gmail.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Fabio Estevam Dec. 10, 2012, 2:32 a.m. UTC 
From: Fabio Estevam <fabio.estevam@freescale.com>

commit b3a223ee2d (spi: Remove SPI_BUFSIZ restriction on spi_write_then_read())
introduced the following build warning:

drivers/spi/spi.c:1655:355: warning: comparison of distinct pointer types lacks a cast [enabled by default]

Provide the cast to avoid the warning.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/spi/spi.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Mark Brown Dec. 10, 2012, 2:46 a.m. UTC | #1 
On Mon, Dec 10, 2012 at 12:32:18AM -0200, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>

> commit b3a223ee2d (spi: Remove SPI_BUFSIZ restriction on spi_write_then_read())
> introduced the following build warning:

> drivers/spi/spi.c:1655:355: warning: comparison of distinct pointer types lacks a cast [enabled by default]

> Provide the cast to avoid the warning.

Grant already fixed that, perhaps he didn't push the change out yet or
it's just that you're testing with -next and it didn't pick it up yet?

------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
diff mbox

Patch

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 224b7bc..78fcff0 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1652,7 +1652,8 @@  int spi_write_then_read(struct spi_device *spi,
 	 * using the pre-allocated buffer or the transfer is too large.
 	 */
 	if ((n_tx + n_rx) > SPI_BUFSIZ || !mutex_trylock(&lock)) {
-		local_buf = kmalloc(max(SPI_BUFSIZ, n_tx + n_rx), GFP_KERNEL);
+		local_buf = kmalloc(max((unsigned)SPI_BUFSIZ, n_tx + n_rx),
+								GFP_KERNEL);
 		if (!local_buf)
 			return -ENOMEM;
 	} else {