diff options
author | Matthias Kaehlcke <matthias.kaehlcke@gmail.com> | 2007-11-05 03:41:01 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:03:32 -0500 |
commit | 1b34fd390c340b0554dcda9552f82d77dff8ed23 (patch) | |
tree | 87e34f7822dff2d085afd8101dc9b56c816372a3 /drivers/net/wireless/prism54/islpci_mgt.c | |
parent | 1e3428e9e327a6e4163b3674b260dbd719f59839 (diff) |
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.c | 4 |
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, | |||
460 | 460 | ||
461 | *recvframe = NULL; | 461 | *recvframe = NULL; |
462 | 462 | ||
463 | if (down_interruptible(&priv->mgmt_sem)) | 463 | if (mutex_lock_interruptible(&priv->mgmt_lock)) |
464 | return -ERESTARTSYS; | 464 | return -ERESTARTSYS; |
465 | 465 | ||
466 | prepare_to_wait(&priv->mgmt_wqueue, &wait, TASK_UNINTERRUPTIBLE); | 466 | prepare_to_wait(&priv->mgmt_wqueue, &wait, TASK_UNINTERRUPTIBLE); |
@@ -504,7 +504,7 @@ islpci_mgt_transaction(struct net_device *ndev, | |||
504 | /* TODO: we should reset the device here */ | 504 | /* TODO: we should reset the device here */ |
505 | out: | 505 | out: |
506 | finish_wait(&priv->mgmt_wqueue, &wait); | 506 | finish_wait(&priv->mgmt_wqueue, &wait); |
507 | up(&priv->mgmt_sem); | 507 | mutex_unlock(&priv->mgmt_lock); |
508 | return err; | 508 | return err; |
509 | } | 509 | } |
510 | 510 | ||