Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c387ec8 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus

parents ba28f22e 3f3e7c6e

drivers/input/gameport/gameport.c

+6 −8
Original line number Diff line number Diff line
@@ -50,9 +50,8 @@ static LIST_HEAD(gameport_list); 


static struct bus_type gameport_bus;



static void gameport_add_driver(struct gameport_driver *drv);

static void gameport_add_port(struct gameport *gameport);

static void gameport_destroy_port(struct gameport *gameport);

static void gameport_attach_driver(struct gameport_driver *drv);

static void gameport_reconnect_port(struct gameport *gameport);

static void gameport_disconnect_port(struct gameport *gameport);
@@ -230,7 +229,6 @@ static void gameport_find_driver(struct gameport *gameport) 


enum gameport_event_type {

	GAMEPORT_REGISTER_PORT,

	GAMEPORT_REGISTER_DRIVER,

	GAMEPORT_ATTACH_DRIVER,

};
@@ -374,8 +372,8 @@ static void gameport_handle_event(void) 
				gameport_add_port(event->object);

				break;



			case GAMEPORT_REGISTER_DRIVER:

				gameport_add_driver(event->object);

			case GAMEPORT_ATTACH_DRIVER:

				gameport_attach_driver(event->object);

				break;



			default:
@@ -706,14 +704,14 @@ static int gameport_driver_remove(struct device *dev) 
	return 0;

}



static void gameport_add_driver(struct gameport_driver *drv)

static void gameport_attach_driver(struct gameport_driver *drv)

{

	int error;



	error = driver_register(&drv->driver);

	error = driver_attach(&drv->driver);

	if (error)

		printk(KERN_ERR

			"gameport: driver_register() failed for %s, error: %d\n",

			"gameport: driver_attach() failed for %s, error: %d\n",

			drv->driver.name, error);

}

drivers/input/input.c

+0 −1
Original line number Diff line number Diff line
@@ -1549,7 +1549,6 @@ int input_register_handle(struct input_handle *handle) 
		return error;

	list_add_tail_rcu(&handle->d_node, &dev->h_list);

	mutex_unlock(&dev->mutex);

	synchronize_rcu();



	/*

	 * Since we are supposed to be called from ->connect()

drivers/input/keyboard/atkbd.c

+19 −1
Original line number Diff line number Diff line
@@ -880,7 +880,7 @@ static unsigned int atkbd_hp_zv6100_forced_release_keys[] = { 
};



/*

 * Samsung NC10 with Fn+F? key release not working

 * Samsung NC10,NC20 with Fn+F? key release not working

 */

static unsigned int atkbd_samsung_forced_release_keys[] = {

	0x82, 0x83, 0x84, 0x86, 0x88, 0x89, 0xb3, 0xf7, 0xf9, -1U
@@ -1533,6 +1533,24 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = { 
		.callback = atkbd_setup_forced_release,

		.driver_data = atkbd_samsung_forced_release_keys,

	},

	{

		.ident = "Samsung NC20",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),

			DMI_MATCH(DMI_PRODUCT_NAME, "NC20"),

		},

		.callback = atkbd_setup_forced_release,

		.driver_data = atkbd_samsung_forced_release_keys,

	},

	{

		.ident = "Samsung SQ45S70S",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),

			DMI_MATCH(DMI_PRODUCT_NAME, "SQ45S70S"),

		},

		.callback = atkbd_setup_forced_release,

		.driver_data = atkbd_samsung_forced_release_keys,

	},

	{

		.ident = "Fujitsu Amilo PA 1510",

		.matches = {

drivers/input/keyboard/bf54x-keys.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static int __devinit bfin_kpad_probe(struct platform_device *pdev) 
	}



	error = request_irq(bf54x_kpad->irq, bfin_kpad_isr,

				 IRQF_SAMPLE_RANDOM, DRV_NAME, pdev);

				0, DRV_NAME, pdev);

	if (error) {

		printk(KERN_ERR DRV_NAME

			": unable to claim irq %d; error %d\n",

drivers/input/misc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ config INPUT_SGI_BTNS 


config HP_SDC_RTC

	tristate "HP SDC Real Time Clock"

	depends on GSC || HP300

	depends on (GSC || HP300) && SERIO

	select HP_SDC

	help

	  Say Y here if you want to support the built-in real time clock