From 261082215fdd6e9e45b50204a3af1e2dd294121c Mon Sep 17 00:00:00 2001 From: Pranav Ravichandran Date: Mon, 15 Oct 2012 23:08:26 +0530 Subject: [PATCH] --- yaml --- r: 337042 b: refs/heads/master c: 1917e7f916352d82f0a88f769b7c6ac7bc76f5af h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/sbe-2t3e3/netdev.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 87693a6236cd..c3c183c92cb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce833d36c63c6aeb0ab9c271c56cb246f0bb82cd +refs/heads/master: 1917e7f916352d82f0a88f769b7c6ac7bc76f5af diff --git a/trunk/drivers/staging/sbe-2t3e3/netdev.c b/trunk/drivers/staging/sbe-2t3e3/netdev.c index 180c96327b9a..1f5088b3c10b 100644 --- a/trunk/drivers/staging/sbe-2t3e3/netdev.c +++ b/trunk/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; }