git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
usb
/
atm
/
usbatm.c
diff --git
a/drivers/usb/atm/usbatm.c
b/drivers/usb/atm/usbatm.c
index
a38701c
..
ec63b0e
100644
(file)
--- a/
drivers/usb/atm/usbatm.c
+++ b/
drivers/usb/atm/usbatm.c
@@
-254,7
+254,7
@@
static int usbatm_submit_urb(struct urb *urb)
return ret;
}
return ret;
}
-static void usbatm_complete(struct urb *urb
, struct pt_regs *regs
)
+static void usbatm_complete(struct urb *urb)
{
struct usbatm_channel *channel = urb->context;
unsigned long flags;
{
struct usbatm_channel *channel = urb->context;
unsigned long flags;
@@
-1001,6
+1001,7
@@
static int usbatm_do_heavy_init(void *arg)
daemonize(instance->driver->driver_name);
allow_signal(SIGTERM);
daemonize(instance->driver->driver_name);
allow_signal(SIGTERM);
+ instance->thread_pid = current->pid;
complete(&instance->thread_started);
complete(&instance->thread_started);
@@
-1025,10
+1026,6
@@
static int usbatm_heavy_init(struct usbatm_data *instance)
return ret;
}
return ret;
}
- mutex_lock(&instance->serialize);
- instance->thread_pid = ret;
- mutex_unlock(&instance->serialize);
-
wait_for_completion(&instance->thread_started);
return 0;
wait_for_completion(&instance->thread_started);
return 0;