From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U9sy6-0008ST-Ds for barebox@lists.infradead.org; Mon, 25 Feb 2013 07:59:30 +0000 Date: Mon, 25 Feb 2013 08:59:24 +0100 From: Sascha Hauer Message-ID: <20130225075924.GM1906@pengutronix.de> References: <1361698333-2727-1-git-send-email-plagnioj@jcrosoft.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1361698333-2727-1-git-send-email-plagnioj@jcrosoft.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 1/1] smc911111: fix send and recv return value To: Jean-Christophe PLAGNIOL-VILLARD Cc: barebox@lists.infradead.org On Sun, Feb 24, 2013 at 10:32:13AM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote: > on error send error code and 0 on success > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Applied, thanks Sascha > --- > drivers/net/smc91111.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c > index 695fa7d..48183dd 100644 > --- a/drivers/net/smc91111.c > +++ b/drivers/net/smc91111.c > @@ -935,7 +935,7 @@ static int smc91c111_eth_send(struct eth_device *edev, void *packet, > > if (numPages > 7) { > printf ("%s: Far too big packet error. \n", SMC_DEV_NAME); > - return 0; > + return -EOVERFLOW; > } > > /* now, try to allocate the memory */ > @@ -965,7 +965,7 @@ again: > if (try < SMC_ALLOC_MAX_TRY) > goto again; > else > - return 0; > + return -ETIMEDOUT; > } > > PRINTK2 ("%s: memory allocation, try %d succeeded ...\n", > @@ -980,7 +980,7 @@ again: > if (packet_no & AR_FAILED) { > /* or isn't there? BAD CHIP! */ > printf ("%s: Memory allocation failed. \n", SMC_DEV_NAME); > - return 0; > + return -ENOMEM; > } > > /* we have a packet address, so tell the card to use it */ > @@ -1046,7 +1046,7 @@ again: > SMC_outb(priv, saved_pnr, PN_REG ); > SMC_outw(priv, saved_ptr, PTR_REG ); > > - return length; > + return 0; > } > > static void smc91c111_eth_halt(struct eth_device *edev) > @@ -1152,10 +1152,10 @@ static int smc91c111_eth_rx(struct eth_device *edev) > if (!is_error) { > /* Pass the packet up to the protocol layers. */ > net_receive(NetRxPackets[0], packet_length); > - return packet_length; > + return 0; > } > > - return 0; > + return -EINVAL; > } > > static int smc91c111_get_ethaddr(struct eth_device *edev, unsigned char *m) > -- > 1.7.10.4 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox