From: Alan Cox Date: Mon, 12 Oct 2009 05:27:55 +0000 (+0000) Subject: ethoc: fix warning from 32bit build X-Git-Tag: MMI-PSA29.97-13-9~25857^2~150 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4ce22537a28eeb6a29a2b4d1049c703a80c25bd1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ethoc: fix warning from 32bit build drivers/net/ethoc.c: In function ‘ethoc_open’: drivers/net/ethoc.c:667: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Alan Cox Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 34d0c69e67f7..1d338c6f5314 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -663,7 +663,8 @@ static int ethoc_open(struct net_device *dev) return ret; /* calculate the number of TX/RX buffers, maximum 128 supported */ - num_bd = min(128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ); + num_bd = min_t(unsigned int, + 128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ); priv->num_tx = max(min_tx, num_bd / 4); priv->num_rx = num_bd - priv->num_tx; ethoc_write(priv, TX_BD_NUM, priv->num_tx);