diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-30 17:35:32 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-30 17:35:32 -0700 |
| commit | e9bcbc970a774bc8e17fd7eb24b9969be67d666e (patch) | |
| tree | af8d8ad62a6b81cc570cdfed83496872e670e909 /drivers/s390/net/lcs.c | |
| parent | 078252e0e877b50fcd42d3bd0d112f1f7c8518e8 (diff) | |
| parent | a68be015aece7b9f33f1523048e445b72ca7111d (diff) | |
Merge branch 's390-next'
Frank Blaschka says:
====================
s390: network patches for net-next V1
here are some s390 related patches for net-next
Added some style fixing reported by David Laight.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/lcs.c')
| -rw-r--r-- | drivers/s390/net/lcs.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index 8d5d96969c3..0a7d87c372b 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c @@ -1943,14 +1943,16 @@ static ssize_t lcs_portno_store (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct lcs_card *card; - int value; + int value, rc; card = dev_get_drvdata(dev); if (!card) return 0; - sscanf(buf, "%u", &value); + rc = sscanf(buf, "%d", &value); + if (rc != 1) + return -EINVAL; /* TODO: sanity checks */ card->portno = value; @@ -1997,14 +1999,17 @@ static ssize_t lcs_timeout_store (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct lcs_card *card; - int value; + unsigned int value; + int rc; card = dev_get_drvdata(dev); if (!card) return 0; - sscanf(buf, "%u", &value); + rc = sscanf(buf, "%u", &value); + if (rc != 1) + return -EINVAL; /* TODO: sanity checks */ card->lancmd_timeout = value; |