aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/et131x/et131x_netdev.c
diff options
context:
space:
mode:
authorMark Einon <mark.einon@gmail.com>2011-09-03 12:49:06 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-09-06 16:53:38 -0700
commit64df17c6fc95740f1e5dfb0ab257bbee9bdb4147 (patch)
tree01fdb4d481181dd54439cb799d55531fff224288 /drivers/staging/et131x/et131x_netdev.c
parentstaging: rtl8192e: Fix format warning (diff)
downloadlinux-dev-64df17c6fc95740f1e5dfb0ab257bbee9bdb4147.tar.xz
linux-dev-64df17c6fc95740f1e5dfb0ab257bbee9bdb4147.zip
staging: et131x: Fix checkpatch whitespace warnings
Some of my previous hacking attempts have not been following the rules. All fixes either lines > 80 chars or whitespace corrections (spaces->tabs etc). Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et131x_netdev.c')
-rw-r--r--drivers/staging/et131x/et131x_netdev.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c
index d12e05ec3b8f..5fb40560c15b 100644
--- a/drivers/staging/et131x/et131x_netdev.c
+++ b/drivers/staging/et131x/et131x_netdev.c
@@ -408,7 +408,7 @@ void et131x_tx_timeout(struct net_device *netdev)
unsigned long flags;
/* If the device is closed, ignore the timeout */
- if (~(adapter->flags & fMP_ADAPTER_INTERRUPT_IN_USE));
+ if (~(adapter->flags & fMP_ADAPTER_INTERRUPT_IN_USE))
return;
/* Any nonrecoverable hardware error?
@@ -453,7 +453,10 @@ void et131x_tx_timeout(struct net_device *netdev)
/* Disable device interrupts */
et131x_disable_interrupts(adapter);
- /* Enable the Tx and Rx DMA engines (if not already enabled) */
+ /*
+ * Enable the Tx and Rx DMA engines
+ * (if not already enabled)
+ */
et131x_rx_dma_enable(adapter);
et131x_tx_dma_enable(adapter);