Pull sony-2.6.24 into release branch

[linux-2.6-omap-h63xx.git] / drivers / net / bfin_mac.c

diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 9a08d656f1ce5a879da190cf1bdb6a662439c9a6..2bb97d464689e9bcbe90db886a08a7f06ef15243 100644 (file)
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -798,6 +798,7 @@ static void bf537mac_shutdown(struct net_device *dev)
  */
 static int bf537mac_open(struct net_device *dev)
 {
+       int retval;
        pr_debug("%s: %s\n", dev->name, __FUNCTION__);
 
        /*
@@ -811,7 +812,10 @@ static int bf537mac_open(struct net_device *dev)
        }
 
        /* initial rx and tx list */
-       desc_list_init();
+       retval = desc_list_init();
+
+       if (retval)
+               return retval;
 
        bf537mac_setphy(dev);
        setup_system_regs(dev);