diff options
Diffstat (limited to 'drivers/macintosh/smu.c')
-rw-r--r-- | drivers/macintosh/smu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index e58c3d33e035..290cb325a94c 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c | |||
@@ -19,7 +19,6 @@ | |||
19 | * the userland interface | 19 | * the userland interface |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/smp_lock.h> | ||
23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
25 | #include <linux/device.h> | 24 | #include <linux/device.h> |
@@ -97,6 +96,7 @@ struct smu_device { | |||
97 | * I don't think there will ever be more than one SMU, so | 96 | * I don't think there will ever be more than one SMU, so |
98 | * for now, just hard code that | 97 | * for now, just hard code that |
99 | */ | 98 | */ |
99 | static DEFINE_MUTEX(smu_mutex); | ||
100 | static struct smu_device *smu; | 100 | static struct smu_device *smu; |
101 | static DEFINE_MUTEX(smu_part_access); | 101 | static DEFINE_MUTEX(smu_part_access); |
102 | static int smu_irq_inited; | 102 | static int smu_irq_inited; |
@@ -1095,12 +1095,12 @@ static int smu_open(struct inode *inode, struct file *file) | |||
1095 | pp->mode = smu_file_commands; | 1095 | pp->mode = smu_file_commands; |
1096 | init_waitqueue_head(&pp->wait); | 1096 | init_waitqueue_head(&pp->wait); |
1097 | 1097 | ||
1098 | lock_kernel(); | 1098 | mutex_lock(&smu_mutex); |
1099 | spin_lock_irqsave(&smu_clist_lock, flags); | 1099 | spin_lock_irqsave(&smu_clist_lock, flags); |
1100 | list_add(&pp->list, &smu_clist); | 1100 | list_add(&pp->list, &smu_clist); |
1101 | spin_unlock_irqrestore(&smu_clist_lock, flags); | 1101 | spin_unlock_irqrestore(&smu_clist_lock, flags); |
1102 | file->private_data = pp; | 1102 | file->private_data = pp; |
1103 | unlock_kernel(); | 1103 | mutex_unlock(&smu_mutex); |
1104 | 1104 | ||
1105 | return 0; | 1105 | return 0; |
1106 | } | 1106 | } |