Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
0201ed03
Commit
0201ed03
authored
May 31, 2012
by
Samuel Ortiz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NFC: Convert pn533 from semaphore to mutex
Signed-off-by:
Samuel Ortiz
<
sameo@linux.intel.com
>
parent
41a8ec49
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
drivers/nfc/pn533.c
drivers/nfc/pn533.c
+7
-7
No files found.
drivers/nfc/pn533.c
View file @
0201ed03
...
@@ -329,7 +329,7 @@ struct pn533 {
...
@@ -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)
...
@@ -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,
...
@@ -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,
...
@@ -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)
...
@@ -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 @@ static void pn533_wq_mi_recv(struct work_struct *work)
...
@@ -2054,7 +2054,7 @@ static void pn533_wq_mi_recv(struct work_struct *work)
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,
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment