net: tsec: Fix NULL access in case init_phy() fails

[karo-tx-uboot.git] / drivers / net / cs8900.c

diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c
index df360042be8d887b83d6eee98869026395d9741b..84963c1f228a15d5faac66c1a652d1aac0e04ac7 100644 (file)
--- a/drivers/net/cs8900.c
+++ b/drivers/net/cs8900.c
@@ -14,9 +14,6 @@
  *
  * Copyright (C) 1999 Ben Williamson <benw@pobox.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
  * This program is loaded into SRAM in bootstrap mode, where it waits
  * for commands on UART1 to read and write memory, jump to code etc.
  * A design goal for this program is to be entirely independent of the
@@ -24,19 +21,7 @@
  * this code in bootstrap mode.  All the board specifics can be handled on
  * the host.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -66,15 +51,14 @@
 static u16 get_reg_init_bus(struct eth_device *dev, int regno)
 {
        /* force 16 bit busmode */
-       volatile u8 c;
        struct cs8900_priv *priv = (struct cs8900_priv *)(dev->priv);
        uint8_t volatile * const iob = (uint8_t volatile * const)dev->iobase;
 
-       c = readb(iob);
-       c = readb(iob + 1);
-       c = readb(iob);
-       c = readb(iob + 1);
-       c = readb(iob);
+       readb(iob);
+       readb(iob + 1);
+       readb(iob);
+       readb(iob + 1);
+       readb(iob);
 
        REG_WRITE(regno, &priv->regs->pptr);
        return REG_READ(&priv->regs->pdata);
@@ -216,8 +200,7 @@ static int cs8900_recv(struct eth_device *dev)
 }
 
 /* Send a data block via Ethernet. */
-static int cs8900_send(struct eth_device *dev,
-                       volatile void *packet, int length)
+static int cs8900_send(struct eth_device *dev, void *packet, int length)
 {
        volatile u16 *addr;
        int tmo;
@@ -308,14 +291,13 @@ int cs8900_initialize(u8 dev_num, int base_addr)
 
        dev = malloc(sizeof(*dev));
        if (!dev) {
-               free(dev);
                return 0;
        }
        memset(dev, 0, sizeof(*dev));
 
        priv = malloc(sizeof(*priv));
        if (!priv) {
-               free(priv);
+               free(dev);
                return 0;
        }
        memset(priv, 0, sizeof(*priv));