Merge branch 'akpm' (Andrew's patchbomb)

[~andy/linux] / drivers / staging / sbe-2t3e3 / netdev.c

diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
index 180c96327b9adc89f6f7e7030d3b16be92ddb948..1f5088b3c10b59ab479cb1aedc9483f3fe3df535 100644 (file)
--- a/drivers/staging/sbe-2t3e3/netdev.c
+++ b/drivers/staging/sbe-2t3e3/netdev.c
@@ -57,7 +57,7 @@ static int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        return 0;
 }
 
-static struct net_device_stats* t3e3_get_stats(struct net_device *dev)
+static struct net_device_stats *t3e3_get_stats(struct net_device *dev)
 {
        struct net_device_stats *nstats = &dev->stats;
        struct channel *sc = dev_to_priv(dev);
@@ -134,7 +134,8 @@ int setup_device(struct net_device *dev, struct channel *sc)
        dev->tx_queue_len = 100;
        hdlc->xmit = t3e3_if_start_xmit;
        hdlc->attach = t3e3_attach;
-       if ((retval = register_hdlc_device(dev))) {
+       retval = register_hdlc_device(dev);
+       if (retval) {
                dev_err(&sc->pdev->dev, "error registering HDLC device\n");
                return retval;
        }