diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
| commit | aaf015890754d58dcb71a4aa44ed246bb082bcf6 (patch) | |
| tree | 17b51ff707fd1b3efec3a3ab872f0d7a7416aca5 /drivers/s390/net/netiucv.c | |
| parent | 9c32c63bb70b2fafc3b18bee29959c3bf245ceba (diff) | |
| parent | 8def5f51b012efb00e77ba2d04696cc0aadd0609 (diff) | |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
Diffstat (limited to 'drivers/s390/net/netiucv.c')
| -rw-r--r-- | drivers/s390/net/netiucv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index 3251333a23df..b6a6356d09b3 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c | |||
| @@ -1994,6 +1994,8 @@ static struct net_device *netiucv_init_netdevice(char *username) | |||
| 1994 | netiucv_setup_netdevice); | 1994 | netiucv_setup_netdevice); |
| 1995 | if (!dev) | 1995 | if (!dev) |
| 1996 | return NULL; | 1996 | return NULL; |
| 1997 | if (dev_alloc_name(dev, dev->name) < 0) | ||
| 1998 | goto out_netdev; | ||
| 1997 | 1999 | ||
| 1998 | privptr = netdev_priv(dev); | 2000 | privptr = netdev_priv(dev); |
| 1999 | privptr->fsm = init_fsm("netiucvdev", dev_state_names, | 2001 | privptr->fsm = init_fsm("netiucvdev", dev_state_names, |