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 <plagnioj@xxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxx
> 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@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
