Commit e0c6b8a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
  apm-emulation: apm_mutex breaks ACK; remove it
  APM: take over maintainership
parents 710421cc fda5fe19

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -548,10 +548,11 @@ S: Maintained 
F:	sound/aoa/



APM DRIVER

L:	linux-laptop@vger.kernel.org

S:	Orphan

M:	Jiri Kosina <jkosina@suse.cz>

S:	Odd fixes

F:	arch/x86/kernel/apm_32.c

F:	include/linux/apm_bios.h

F:	drivers/char/apm-emulation.c



APPLE BCM5974 MULTITOUCH DRIVER

M:	Henrik Rydberg <rydberg@euromail.se>

drivers/char/apm-emulation.c

+0 −5
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ struct apm_user { 
/*

 * Local variables

 */

static DEFINE_MUTEX(apm_mutex);

static atomic_t suspend_acks_pending = ATOMIC_INIT(0);

static atomic_t userspace_notification_inhibit = ATOMIC_INIT(0);

static int apm_disabled;
@@ -275,7 +274,6 @@ apm_ioctl(struct file *filp, u_int cmd, u_long arg) 
	if (!as->suser || !as->writer)

		return -EPERM;



	mutex_lock(&apm_mutex);

	switch (cmd) {

	case APM_IOC_SUSPEND:

		mutex_lock(&state_lock);
@@ -336,7 +334,6 @@ apm_ioctl(struct file *filp, u_int cmd, u_long arg) 
		mutex_unlock(&state_lock);

		break;

	}

	mutex_unlock(&apm_mutex);



	return err;

}
@@ -371,7 +368,6 @@ static int apm_open(struct inode * inode, struct file * filp) 
{

	struct apm_user *as;



	mutex_lock(&apm_mutex);

	as = kzalloc(sizeof(*as), GFP_KERNEL);

	if (as) {

		/*
@@ -391,7 +387,6 @@ static int apm_open(struct inode * inode, struct file * filp) 


		filp->private_data = as;

	}

	mutex_unlock(&apm_mutex);



	return as ? 0 : -ENOMEM;

}