From 8fc75c28d65f33156a3e3f96f366b51229ffcfbb Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Wed, 5 Sep 2012 15:33:48 +0530 Subject: [PATCH] --- yaml --- r: 324813 b: refs/heads/master c: 71329965273d65d6de1bc34c6b314515d52ae49a h: refs/heads/master i: 324811: 21e65e55c3384c36b28b9f1f0f89078f1317c90b v: v3 --- [refs] | 2 +- trunk/drivers/staging/slicoss/slicoss.c | 20 +++++--------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 4cecdad70432..400953706e6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92adcc805764f5b5c552741298c079ce2de8757e +refs/heads/master: 71329965273d65d6de1bc34c6b314515d52ae49a diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c index 10dcd331795b..850eb1064a49 100644 --- a/trunk/drivers/staging/slicoss/slicoss.c +++ b/trunk/drivers/staging/slicoss/slicoss.c @@ -3132,7 +3132,6 @@ static int slic_entry_open(struct net_device *dev) { struct adapter *adapter = netdev_priv(dev); struct sliccard *card = adapter->card; - u32 locked = 0; int status; ASSERT(adapter); @@ -3142,7 +3141,6 @@ static int slic_entry_open(struct net_device *dev) spin_lock_irqsave(&slic_global.driver_lock.lock, slic_global.driver_lock.flags); - locked = 1; if (!adapter->activated) { card->adapters_activated++; slic_global.num_slic_ports_active++; @@ -3156,23 +3154,15 @@ static int slic_entry_open(struct net_device *dev) slic_global.num_slic_ports_active--; adapter->activated = 0; } - if (locked) { - spin_unlock_irqrestore(&slic_global.driver_lock.lock, - slic_global.driver_lock.flags); - locked = 0; - } - return status; + goto spin_unlock; } if (!card->master) card->master = adapter; - if (locked) { - spin_unlock_irqrestore(&slic_global.driver_lock.lock, - slic_global.driver_lock.flags); - locked = 0; - } - - return 0; +spin_unlock: + spin_unlock_irqrestore(&slic_global.driver_lock.lock, + slic_global.driver_lock.flags); + return status; } static void slic_card_cleanup(struct sliccard *card)