diff options
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/sis/sis190.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index b5eb4195fc99..93ee49d29317 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c | |||
@@ -1898,9 +1898,6 @@ static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs, | |||
1898 | { | 1898 | { |
1899 | struct rtl8169_private *tp = netdev_priv(dev); | 1899 | struct rtl8169_private *tp = netdev_priv(dev); |
1900 | 1900 | ||
1901 | if (regs->len > R8169_REGS_SIZE) | ||
1902 | regs->len = R8169_REGS_SIZE; | ||
1903 | |||
1904 | rtl_lock_work(tp); | 1901 | rtl_lock_work(tp); |
1905 | memcpy_fromio(p, tp->mmio_addr, regs->len); | 1902 | memcpy_fromio(p, tp->mmio_addr, regs->len); |
1906 | rtl_unlock_work(tp); | 1903 | rtl_unlock_work(tp); |
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); |