diff options
| author | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
| commit | f1f76afd71e0f17af9a35fcb649f4bab53304a4d (patch) | |
| tree | a56257b13a0eda4a9b7e950c3b85adad16341b80 /drivers/input/joystick/iforce/iforce-main.c | |
| parent | 530515a06f90c0831732709efee4a99497bd2b7c (diff) | |
| parent | 385910f2b275a636238f70844f1b6da9fda6f2da (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/input/joystick/iforce/iforce-main.c')
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c index b6bc04998047..ab0a26b924ca 100644 --- a/drivers/input/joystick/iforce/iforce-main.c +++ b/drivers/input/joystick/iforce/iforce-main.c | |||
| @@ -350,7 +350,7 @@ int iforce_init_device(struct iforce *iforce) | |||
| 350 | 350 | ||
| 351 | init_waitqueue_head(&iforce->wait); | 351 | init_waitqueue_head(&iforce->wait); |
| 352 | spin_lock_init(&iforce->xmit_lock); | 352 | spin_lock_init(&iforce->xmit_lock); |
| 353 | init_MUTEX(&iforce->mem_mutex); | 353 | mutex_init(&iforce->mem_mutex); |
| 354 | iforce->xmit.buf = iforce->xmit_data; | 354 | iforce->xmit.buf = iforce->xmit_data; |
| 355 | iforce->dev = input_dev; | 355 | iforce->dev = input_dev; |
| 356 | 356 | ||