summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/prism54/islpci_mgt.c
diff options
context:
space:
mode:
authorMatthias Kaehlcke <matthias.kaehlcke@gmail.com>2007-11-05 09:41:01 +0100
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:03:32 -0800
commit1b34fd390c340b0554dcda9552f82d77dff8ed23 (patch)
tree87e34f7822dff2d085afd8101dc9b56c816372a3 /drivers/net/wireless/prism54/islpci_mgt.c
parent1e3428e9e327a6e4163b3674b260dbd719f59839 (diff)
downloadblackbird-op-linux-1b34fd390c340b0554dcda9552f82d77dff8ed23.tar.gz
blackbird-op-linux-1b34fd390c340b0554dcda9552f82d77dff8ed23.zip
Prism54: Convert mgmt_sem to the mutex API
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/prism54/islpci_mgt.c')
-rw-r--r--drivers/net/wireless/prism54/islpci_mgt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c
index 2246f7930b4e..f7c677e2094d 100644
--- a/drivers/net/wireless/prism54/islpci_mgt.c
+++ b/drivers/net/wireless/prism54/islpci_mgt.c
@@ -460,7 +460,7 @@ islpci_mgt_transaction(struct net_device *ndev,
*recvframe = NULL;
- if (down_interruptible(&priv->mgmt_sem))
+ if (mutex_lock_interruptible(&priv->mgmt_lock))
return -ERESTARTSYS;
prepare_to_wait(&priv->mgmt_wqueue, &wait, TASK_UNINTERRUPTIBLE);
@@ -504,7 +504,7 @@ islpci_mgt_transaction(struct net_device *ndev,
/* TODO: we should reset the device here */
out:
finish_wait(&priv->mgmt_wqueue, &wait);
- up(&priv->mgmt_sem);
+ mutex_unlock(&priv->mgmt_lock);
return err;
}
OpenPOWER on IntegriCloud