| 1 |
--- em8300-0.18.0-n/modules/em8300_main.c 2011-01-14 17:24:18.798732449 +0200 |
| 2 |
+++ em8300-0.18.0-nn/modules/em8300_main.c 2011-01-14 17:36:43.685891526 +0200 |
| 3 |
@@ -864,7 +864,12 @@ |
| 4 |
init_waitqueue_head(&em->sp_ptsfifo_wait); |
| 5 |
|
| 6 |
em->audio_driver_style = NONE; |
| 7 |
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37) |
| 8 |
+ /* TODO: check if this should be a mutex instead */ |
| 9 |
+ sema_init(&em->audio_driver_style_lock, 1); |
| 10 |
+#else |
| 11 |
init_MUTEX(&em->audio_driver_style_lock); |
| 12 |
+#endif |
| 13 |
|
| 14 |
result = request_irq(dev->irq, em8300_irq, IRQF_SHARED | IRQF_DISABLED, "em8300", (void *) em); |
| 15 |
|
| 16 |
--- em8300-0.18.0-n/include/linux/em8300.h 2009-12-21 00:24:55.000000000 +0200 |
| 17 |
+++ em8300-0.18.0-nn/include/linux/em8300.h 2011-01-14 17:35:16.483771864 +0200 |
| 18 |
@@ -233,6 +233,9 @@ |
| 19 |
#include <linux/time.h> /* struct timeval */ |
| 20 |
#include <linux/wait.h> /* wait_queue_head_t */ |
| 21 |
#include <linux/list.h> /* struct list_head */ |
| 22 |
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) |
| 23 |
+#include <linux/semaphore.h> /* struct semaphore */ |
| 24 |
+#endif |
| 25 |
|
| 26 |
#if defined(CONFIG_SND) || defined(CONFIG_SND_MODULE) |
| 27 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) |
| 28 |
--- em8300-0.18.0-n/modules/em8300_alsa.c 2009-12-21 00:24:55.000000000 +0200 |
| 29 |
+++ em8300-0.18.0-nn/modules/em8300_alsa.c 2011-01-14 17:50:49.185523277 +0200 |
| 30 |
@@ -487,7 +487,12 @@ |
| 31 |
|
| 32 |
memset(em8300_alsa, 0, sizeof(em8300_alsa_t)); |
| 33 |
|
| 34 |
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37) |
| 35 |
+ /* TODO: check if this should be a mutex instead */ |
| 36 |
+ sema_init(&em8300_alsa->lock, 1); |
| 37 |
+#else |
| 38 |
init_MUTEX(&em8300_alsa->lock); |
| 39 |
+#endif |
| 40 |
|
| 41 |
em8300_alsa->em = em; |
| 42 |
em8300_alsa->card = card; |
| 43 |
--- em8300-0.18.0-n/modules/em8300_fifo.c 2009-12-21 00:24:55.000000000 +0200 |
| 44 |
+++ em8300-0.18.0-nn/modules/em8300_fifo.c 2011-01-14 17:51:17.594450229 +0200 |
| 45 |
@@ -115,7 +115,12 @@ |
| 46 |
} |
| 47 |
} |
| 48 |
|
| 49 |
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37) |
| 50 |
+ /* TODO: check if this should be a mutex instead */ |
| 51 |
+ sema_init(&f->lock, 1); |
| 52 |
+#else |
| 53 |
init_MUTEX(&f->lock); |
| 54 |
+#endif |
| 55 |
f->valid = 1; |
| 56 |
|
| 57 |
return 0; |
Parent Directory
| 
Revision Log