aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/atlx/atlx.c
diff options
context:
space:
mode:
authorTony Zelenoff <antonz@parallels.com>2012-04-11 06:15:03 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-27 09:51:20 -0700
commitbb2f6102c815c14572642205191eb0fa883d8723 (patch)
tree4158479d3746658d5b2c1efcf3c9c86010105be5 /drivers/net/atlx/atlx.c
parent4a1abcbd24d856fe49029c3dc6f7fe8dc66ddaac (diff)
downloadkernel_samsung_smdk4412-bb2f6102c815c14572642205191eb0fa883d8723.zip
kernel_samsung_smdk4412-bb2f6102c815c14572642205191eb0fa883d8723.tar.gz
kernel_samsung_smdk4412-bb2f6102c815c14572642205191eb0fa883d8723.tar.bz2
atl1: fix kernel panic in case of DMA errors
[ Upstream commit 03662e41c7cff64a776bfb1b3816de4be43de881 ] Problem: There was two separate work_struct structures which share one handler. Unfortunately getting atl1_adapter structure from work_struct in case of DMA error was done from incorrect offset which cause kernel panics. Solution: The useless work_struct for DMA error removed and handler name changed to more generic one. Signed-off-by: Tony Zelenoff <antonz@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/atlx/atlx.c')
-rw-r--r--drivers/net/atlx/atlx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atlx/atlx.c b/drivers/net/atlx/atlx.c
index afb7f7d..2b7af06 100644
--- a/drivers/net/atlx/atlx.c
+++ b/drivers/net/atlx/atlx.c
@@ -193,7 +193,7 @@ static void atlx_tx_timeout(struct net_device *netdev)
{
struct atlx_adapter *adapter = netdev_priv(netdev);
/* Do the reset outside of interrupt context */
- schedule_work(&adapter->tx_timeout_task);
+ schedule_work(&adapter->reset_dev_task);
}
/*