aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/unisys/visornic
diff options
context:
space:
mode:
authorTim Sell <Timothy.Sell@unisys.com>2015-07-28 12:29:08 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-31 16:10:35 -0700
commit6483783d24afc22248f3051326681a4327e29e72 (patch)
tree3b8cb1ab696bebc6d7c98c372456ed8b97025089 /drivers/staging/unisys/visornic
parentstaging: unisys: visornic - prevent lock recursion after IO recovery (diff)
downloadlinux-dev-6483783d24afc22248f3051326681a4327e29e72.tar.xz
linux-dev-6483783d24afc22248f3051326681a4327e29e72.zip
staging: unisys: visornic - correctly reset flag prior to send_enbdis()
Because devdata->enab_dis_acked is the flag used to determine whether an enable/disable operation to the IO partition has completed, it should always be cleared prior to initiating the operation. The call added to visornic_enable_with_timeout() added in this patch makes the usage there consistent with visornic_disable_with_timeout(). Signed-off-by: Tim Sell <Timothy.Sell@unisys.com> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys/visornic')
-rw-r--r--drivers/staging/unisys/visornic/visornic_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c
index 801e66abf58e..02906ef6c4c6 100644
--- a/drivers/staging/unisys/visornic/visornic_main.c
+++ b/drivers/staging/unisys/visornic/visornic_main.c
@@ -680,6 +680,7 @@ visornic_enable_with_timeout(struct net_device *netdev, const int timeout)
spin_lock_irqsave(&devdata->priv_lock, flags);
devdata->enabled = 1;
+ devdata->enab_dis_acked = 0;
/* now we're ready, let's send an ENB to uisnic but until we get
* an ACK back from uisnic, we'll drop the packets