diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/apm-emulation.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c index 45b987c9889e..548708c4b2b8 100644 --- a/drivers/char/apm-emulation.c +++ b/drivers/char/apm-emulation.c | |||
@@ -126,7 +126,6 @@ struct apm_user { | |||
126 | /* | 126 | /* |
127 | * Local variables | 127 | * Local variables |
128 | */ | 128 | */ |
129 | static DEFINE_MUTEX(apm_mutex); | ||
130 | static atomic_t suspend_acks_pending = ATOMIC_INIT(0); | 129 | static atomic_t suspend_acks_pending = ATOMIC_INIT(0); |
131 | static atomic_t userspace_notification_inhibit = ATOMIC_INIT(0); | 130 | static atomic_t userspace_notification_inhibit = ATOMIC_INIT(0); |
132 | static int apm_disabled; | 131 | static int apm_disabled; |
@@ -275,7 +274,6 @@ apm_ioctl(struct file *filp, u_int cmd, u_long arg) | |||
275 | if (!as->suser || !as->writer) | 274 | if (!as->suser || !as->writer) |
276 | return -EPERM; | 275 | return -EPERM; |
277 | 276 | ||
278 | mutex_lock(&apm_mutex); | ||
279 | switch (cmd) { | 277 | switch (cmd) { |
280 | case APM_IOC_SUSPEND: | 278 | case APM_IOC_SUSPEND: |
281 | mutex_lock(&state_lock); | 279 | mutex_lock(&state_lock); |
@@ -336,7 +334,6 @@ apm_ioctl(struct file *filp, u_int cmd, u_long arg) | |||
336 | mutex_unlock(&state_lock); | 334 | mutex_unlock(&state_lock); |
337 | break; | 335 | break; |
338 | } | 336 | } |
339 | mutex_unlock(&apm_mutex); | ||
340 | 337 | ||
341 | return err; | 338 | return err; |
342 | } | 339 | } |
@@ -371,7 +368,6 @@ static int apm_open(struct inode * inode, struct file * filp) | |||
371 | { | 368 | { |
372 | struct apm_user *as; | 369 | struct apm_user *as; |
373 | 370 | ||
374 | mutex_lock(&apm_mutex); | ||
375 | as = kzalloc(sizeof(*as), GFP_KERNEL); | 371 | as = kzalloc(sizeof(*as), GFP_KERNEL); |
376 | if (as) { | 372 | if (as) { |
377 | /* | 373 | /* |
@@ -391,7 +387,6 @@ static int apm_open(struct inode * inode, struct file * filp) | |||
391 | 387 | ||
392 | filp->private_data = as; | 388 | filp->private_data = as; |
393 | } | 389 | } |
394 | mutex_unlock(&apm_mutex); | ||
395 | 390 | ||
396 | return as ? 0 : -ENOMEM; | 391 | return as ? 0 : -ENOMEM; |
397 | } | 392 | } |