diff mbox

[PATCH/RFC] input: hil_mlc - Fix hil_mlc_serio_id file2alias failure

Message ID alpine.DEB.2.00.1010122111270.6491@ayla.of.borg (mailing list archive)
State Rejected
Delegated to: Helge Deller
Headers show

Commit Message

Geert Uytterhoeven Oct. 12, 2010, 7:17 p.m. UTC
None
diff mbox

Patch

diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c
index cc8e01f..43904db 100644
--- a/drivers/input/serio/hil_mlc.c
+++ b/drivers/input/serio/hil_mlc.c
@@ -897,11 +897,15 @@  static void hil_mlc_serio_close(struct serio *serio)
 	/* TODO wake up interruptable */
 }
 
-static const struct serio_device_id hil_mlc_serio_id = {
-	.type = SERIO_HIL_MLC,
-	.proto = SERIO_HIL,
-	.extra = SERIO_ANY,
-	.id = SERIO_ANY,
+static const struct serio_device_id hil_mlc_serio_ids[] = {
+	{
+	    /* There's only one ID, which is a catch-all */
+	    .type = SERIO_HIL_MLC,
+	    .proto = SERIO_HIL,
+	    .extra = SERIO_ANY,
+	    .id = SERIO_ANY,
+	},
+	{ 0 }
 };
 
 int hil_mlc_register(hil_mlc *mlc)
@@ -934,7 +938,7 @@  int hil_mlc_register(hil_mlc *mlc)
 		mlc->serio[i] = mlc_serio;
 		snprintf(mlc_serio->name, sizeof(mlc_serio->name)-1, "HIL_SERIO%d", i);
 		snprintf(mlc_serio->phys, sizeof(mlc_serio->phys)-1, "HIL%d", i);
-		mlc_serio->id			= hil_mlc_serio_id;
+		mlc_serio->id			= hil_mlc_serio_ids[0];
 		mlc_serio->id.id		= i; /* HIL port no. */
 		mlc_serio->write		= hil_mlc_serio_write;
 		mlc_serio->open			= hil_mlc_serio_open;
@@ -1011,7 +1015,7 @@  static void __exit hil_mlc_exit(void)
 }
 
 
-MODULE_DEVICE_TABLE(serio, hil_mlc_serio_id);
+MODULE_DEVICE_TABLE(serio, hil_mlc_serio_ids);
 
 module_init(hil_mlc_init);
 module_exit(hil_mlc_exit);