diff options
author | Peter Wu <lekensteyn@gmail.com> | 2013-08-16 19:07:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-20 17:57:42 -0400 |
commit | e7fb06a1b4d1c5bdcbbf78f7c7e938835395bcdb (patch) | |
tree | 869b81ffd62cafc21eaf5f75b049dc9a8c10bca5 /drivers/net/ethernet/sis | |
parent | d765bb41fde311b57de32bdc9d17965debe8b7af (diff) |
r8169,sis190: remove unnecessary length check
The ethtool core will lower the requested length to the one returned by
get_regs_len, therefore no additional check is needed in the get_regs
function.
Reported-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Peter Wu <lekensteyn@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sis')
-rw-r--r-- | drivers/net/ethernet/sis/sis190.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c index 02df0894690d..ee18e6f7b4fe 100644 --- a/drivers/net/ethernet/sis/sis190.c +++ b/drivers/net/ethernet/sis/sis190.c | |||
@@ -1770,9 +1770,6 @@ static void sis190_get_regs(struct net_device *dev, struct ethtool_regs *regs, | |||
1770 | struct sis190_private *tp = netdev_priv(dev); | 1770 | struct sis190_private *tp = netdev_priv(dev); |
1771 | unsigned long flags; | 1771 | unsigned long flags; |
1772 | 1772 | ||
1773 | if (regs->len > SIS190_REGS_SIZE) | ||
1774 | regs->len = SIS190_REGS_SIZE; | ||
1775 | |||
1776 | spin_lock_irqsave(&tp->lock, flags); | 1773 | spin_lock_irqsave(&tp->lock, flags); |
1777 | memcpy_fromio(p, tp->mmio_addr, regs->len); | 1774 | memcpy_fromio(p, tp->mmio_addr, regs->len); |
1778 | spin_unlock_irqrestore(&tp->lock, flags); | 1775 | spin_unlock_irqrestore(&tp->lock, flags); |