[U-Boot] [PATCH] smc911x: make smc911x_initialize return correct value (Was: Re: [PATCH 1/5] smc911x: return -1 when initialization fails)

[Mike Rapoport]

Mike Frysinger wrote:
> On Wednesday 11 November 2009 03:03:00 Mike Rapoport wrote:
>> --- a/drivers/net/smc911x.c
>> +++ b/drivers/net/smc911x.c
>> @@ -243,7 +243,7 @@
>>      dev = malloc(sizeof(*dev));
>>      if (!dev) {
>>              free(dev);
>> -            return 0;
>> +            return -1;
>>      }
> 
> this is correct as this is an error
> 
>> @@ -252,7 +252,7 @@
>>      /* Try to detect chip. Will fail if not present. */
>>      if (smc911x_detect_chip(dev)) {
>>              free(dev);
>> -            return 0;
>> +            return -1;
>>      }
> 
> this is not -- we want it to return 0 if no parts are found.  see recent net 
> doc updates and discussions.
> -mike

Hope this one is better:

>From 4a9420704dd81a08f950017d365e0826880536ed Mon Sep 17 00:00:00 2001
From: Mike Rapoport <m...@compulab.co.il>
Date: Tue, 10 Nov 2009 15:31:46 +0200
Subject: [PATCH] smc911x: make smc911x_initialize return correct value

Make smc911x_initialize return -1 on error and number of interfaces
detected otherwise.

Signed-off-by: Mike Rapoport <m...@compulab.co.il>
---
 drivers/net/smc911x.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index acc2306..5d51406 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -243,7 +243,7 @@ int smc911x_initialize(u8 dev_num, int base_addr)
        dev = malloc(sizeof(*dev));
        if (!dev) {
                free(dev);
-               return 0;
+               return -1;
        }
        memset(dev, 0, sizeof(*dev));

@@ -271,5 +271,5 @@ int smc911x_initialize(u8 dev_num, int base_addr)
        sprintf(dev->name, "%s-%hu", DRIVERNAME, dev_num);

        eth_register(dev);
-       return 0;
+       return 1;
 }
-- 
1.6.0.6



> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

-- 
Sincerely yours,
Mike.

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot