lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uwb: fix use of del_timer_sync() in interrupt

Browse Source 
del_timer_sync() cannot be used in interrupt.
Replace it with del_timer() and a flag

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oliver Neukum
2012-04-16 15:28:28 +02:00
committed by Greg Kroah-Hartman
parent 2fbe2bf1fd
commit 9426cd0568
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/uwb/neh.c
View File

@@ -107,6 +107,7 @@ struct uwb_rc_neh {
u8 evt_type; u8 evt_type;
__le16 evt; __le16 evt;
u8 context; u8 context;
u8 completed;
uwb_rc_cmd_cb_f cb; uwb_rc_cmd_cb_f cb;
void *arg; void *arg;
@@ -409,6 +410,7 @@ static void uwb_rc_neh_grok_event(struct uwb_rc *rc, struct uwb_rceb *rceb, size
struct device *dev = &rc->uwb_dev.dev; struct device *dev = &rc->uwb_dev.dev;
struct uwb_rc_neh *neh; struct uwb_rc_neh *neh;
struct uwb_rceb *notif; struct uwb_rceb *notif;
unsigned long flags;
if (rceb->bEventContext == 0) { if (rceb->bEventContext == 0) {
notif = kmalloc(size, GFP_ATOMIC); notif = kmalloc(size, GFP_ATOMIC);
@@ -422,7 +424,11 @@ static void uwb_rc_neh_grok_event(struct uwb_rc *rc, struct uwb_rceb *rceb, size
} else { } else {
neh = uwb_rc_neh_lookup(rc, rceb); neh = uwb_rc_neh_lookup(rc, rceb);
if (neh) { if (neh) {
del_timer_sync(&neh->timer); spin_lock_irqsave(&rc->neh_lock, flags);
/* to guard against a timeout */
neh->completed = 1;
del_timer(&neh->timer);
spin_unlock_irqrestore(&rc->neh_lock, flags);
uwb_rc_neh_cb(neh, rceb, size); uwb_rc_neh_cb(neh, rceb, size);
} else } else
dev_warn(dev, "event 0x%02x/%04x/%02x (%zu bytes): nobody cared\n", dev_warn(dev, "event 0x%02x/%04x/%02x (%zu bytes): nobody cared\n",
@@ -568,6 +574,10 @@ static void uwb_rc_neh_timer(unsigned long arg)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&rc->neh_lock, flags); spin_lock_irqsave(&rc->neh_lock, flags);
if (neh->completed) {
spin_unlock_irqrestore(&rc->neh_lock, flags);
return;
}
if (neh->context) if (neh->context)
__uwb_rc_neh_rm(rc, neh); __uwb_rc_neh_rm(rc, neh);
else else