iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFC: Convert pn533 from semaphore to mutex

Browse Source 
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2012-05-31 17:56:46 +02:00
parent 41a8ec496d
commit 0201ed0349
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/nfc/pn533.c
View File

@ -329,7 +329,7 @@ struct pn533 {
pn533_cmd_complete_t cmd_complete; pn533_cmd_complete_t cmd_complete;
void *cmd_complete_arg; void *cmd_complete_arg;
struct semaphore cmd_lock; struct mutex cmd_lock;
u8 cmd; u8 cmd;
struct pn533_poll_modulations *poll_mod_active[PN533_POLL_MOD_MAX + 1]; struct pn533_poll_modulations *poll_mod_active[PN533_POLL_MOD_MAX + 1];
@ -462,7 +462,7 @@ static void pn533_wq_cmd_complete(struct work_struct *work)
PN533_FRAME_CMD_PARAMS_LEN(in_frame)); PN533_FRAME_CMD_PARAMS_LEN(in_frame));
if (rc != -EINPROGRESS) if (rc != -EINPROGRESS)
up(&dev->cmd_lock); mutex_unlock(&dev->cmd_lock);
} }
static void pn533_recv_response(struct urb *urb) static void pn533_recv_response(struct urb *urb)
@ -640,7 +640,7 @@ static int pn533_send_cmd_frame_async(struct pn533 *dev,
nfc_dev_dbg(&dev->interface->dev, "%s", __func__); nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
if (down_trylock(&dev->cmd_lock)) if (!mutex_trylock(&dev->cmd_lock))
return -EBUSY; return -EBUSY;
rc = __pn533_send_cmd_frame_async(dev, out_frame, in_frame, rc = __pn533_send_cmd_frame_async(dev, out_frame, in_frame,
@ -650,7 +650,7 @@ static int pn533_send_cmd_frame_async(struct pn533 *dev,
return 0; return 0;
error: error:
up(&dev->cmd_lock); mutex_unlock(&dev->cmd_lock);
return rc; return rc;
} }
@ -1261,7 +1261,7 @@ static void pn533_listen_mode_timer(unsigned long data)
dev->cancel_listen = 1; dev->cancel_listen = 1;
up(&dev->cmd_lock); mutex_unlock(&dev->cmd_lock);
pn533_poll_next_mod(dev); pn533_poll_next_mod(dev);
@ -2054,7 +2054,7 @@ error_cmd:
kfree(arg); kfree(arg);
up(&dev->cmd_lock); mutex_unlock(&dev->cmd_lock);
} }
static int pn533_set_configuration(struct pn533 *dev, u8 cfgitem, u8 *cfgdata, static int pn533_set_configuration(struct pn533 *dev, u8 cfgitem, u8 *cfgdata,
@ -2114,7 +2114,7 @@ static int pn533_probe(struct usb_interface *interface,
dev->udev = usb_get_dev(interface_to_usbdev(interface)); dev->udev = usb_get_dev(interface_to_usbdev(interface));
dev->interface = interface; dev->interface = interface;
sema_init(&dev->cmd_lock, 1); mutex_init(&dev->cmd_lock);
iface_desc = interface->cur_altsetting; iface_desc = interface->cur_altsetting;
for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {