diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-13 10:59:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-13 10:59:46 -0400 |
| commit | 687d911466774808ed4926edadb20cc4f0153bed (patch) | |
| tree | cffcc4ff8c4064e31133859707da748ef08d1483 | |
| parent | de1dfeefefde51e781df49c80f90f1f306fd0cf5 (diff) | |
| parent | f7e3a16c4a80add7ab965fb5d50dbe5f29ec1628 (diff) | |
| download | linux-687d911466774808ed4926edadb20cc4f0153bed.tar.gz linux-687d911466774808ed4926edadb20cc4f0153bed.tar.bz2 linux-687d911466774808ed4926edadb20cc4f0153bed.zip | |
Merge branch 's390-net'
Ursula Braun says:
====================
s390 network driver patches
here are 3 small patches for the s390 network drivers netiucv and lcs.
They are built for the net-tree.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/s390/net/lcs.c | 2 | ||||
| -rw-r--r-- | drivers/s390/net/netiucv.c | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index 251db0a02e73..211b31d9f157 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c @@ -1888,7 +1888,7 @@ lcs_stop_device(struct net_device *dev) rc = lcs_stopcard(card); if (rc) dev_err(&card->dev->dev, - " Shutting down the LCS device failed\n "); + " Shutting down the LCS device failed\n"); return rc; } diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index b0e8ffdf864b..2f0f3918172a 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c @@ -302,8 +302,7 @@ static char *netiucv_printuser(struct iucv_connection *conn) if (memcmp(conn->userdata, iucvMagic_ebcdic, 16)) { tmp_uid[8] = '\0'; tmp_udat[16] = '\0'; - memcpy(tmp_uid, conn->userid, 8); - memcpy(tmp_uid, netiucv_printname(tmp_uid, 8), 8); + memcpy(tmp_uid, netiucv_printname(conn->userid, 8), 8); memcpy(tmp_udat, conn->userdata, 16); EBCASC(tmp_udat, 16); memcpy(tmp_udat, netiucv_printname(tmp_udat, 16), 16); @@ -1564,21 +1563,21 @@ static ssize_t buffer_write (struct device *dev, struct device_attribute *attr, { struct netiucv_priv *priv = dev_get_drvdata(dev); struct net_device *ndev = priv->conn->netdev; - char *e; - int bs1; + unsigned int bs1; + int rc; IUCV_DBF_TEXT(trace, 3, __func__); if (count >= 39) return -EINVAL; - bs1 = simple_strtoul(buf, &e, 0); + rc = kstrtouint(buf, 0, &bs1); - if (e && (!isspace(*e))) { - IUCV_DBF_TEXT_(setup, 2, "buffer_write: invalid char %02x\n", - *e); + if (rc == -EINVAL) { + IUCV_DBF_TEXT_(setup, 2, "buffer_write: invalid char %s\n", + buf); return -EINVAL; } - if (bs1 > NETIUCV_BUFSIZE_MAX) { + if ((rc == -ERANGE) || (bs1 > NETIUCV_BUFSIZE_MAX)) { IUCV_DBF_TEXT_(setup, 2, "buffer_write: buffer size %d too large\n", bs1); |