Commit a11485b7 authored by David S. Miller's avatar David S. Miller

Merge branch 'amd-xgbe-next'

Tom Lendacky says:

====================
amd-xgbe: AMD XGBE driver updates 2016-11-15

This patch series addresses some minor issues found in the recently
accepted patch series for the AMD XGBE driver.

The following fixes are included in this driver update series:

- Fix a possibly uninitialized variable in the debugfs support
- Fix the GPIO pin number constraint check

This patch series is based on net-next.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 54dbf3a5 1c1f619e
...@@ -153,7 +153,7 @@ static ssize_t xgbe_common_write(const char __user *buffer, size_t count, ...@@ -153,7 +153,7 @@ static ssize_t xgbe_common_write(const char __user *buffer, size_t count,
int ret; int ret;
if (*ppos != 0) if (*ppos != 0)
return 0; return -EINVAL;
if (count >= sizeof(workarea)) if (count >= sizeof(workarea))
return -ENOSPC; return -ENOSPC;
......
...@@ -1099,7 +1099,7 @@ static int xgbe_clr_gpio(struct xgbe_prv_data *pdata, unsigned int gpio) ...@@ -1099,7 +1099,7 @@ static int xgbe_clr_gpio(struct xgbe_prv_data *pdata, unsigned int gpio)
{ {
unsigned int reg; unsigned int reg;
if (gpio > 16) if (gpio > 15)
return -EINVAL; return -EINVAL;
reg = XGMAC_IOREAD(pdata, MAC_GPIOSR); reg = XGMAC_IOREAD(pdata, MAC_GPIOSR);
...@@ -1114,7 +1114,7 @@ static int xgbe_set_gpio(struct xgbe_prv_data *pdata, unsigned int gpio) ...@@ -1114,7 +1114,7 @@ static int xgbe_set_gpio(struct xgbe_prv_data *pdata, unsigned int gpio)
{ {
unsigned int reg; unsigned int reg;
if (gpio > 16) if (gpio > 15)
return -EINVAL; return -EINVAL;
reg = XGMAC_IOREAD(pdata, MAC_GPIOSR); reg = XGMAC_IOREAD(pdata, MAC_GPIOSR);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment