Commit 72638f59 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

PNP: fix broken pnp lowercasing for acpi module aliases 



Based on a patch from Brian, who identified the issue.

Signed-off-by: default avatarBryan Kadzban <bryan@kadzban.is-a-geek.net>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7143f7a1

scripts/mod/file2alias.c

+15 −2
Original line number Diff line number Diff line
@@ -366,11 +366,17 @@ static void do_pnp_device_entry(void *symval, unsigned long size, 


	for (i = 0; i < count; i++) {

		const char *id = (char *)devs[i].id;

		char acpi_id[sizeof(devs[0].id)];

		int j;



		buf_printf(&mod->dev_table_buf,

			   "MODULE_ALIAS(\"pnp:d%s*\");\n", id);



		/* fix broken pnp bus lowercasing */

		for (j = 0; j < sizeof(acpi_id); j++)

			acpi_id[j] = toupper(id[j]);

		buf_printf(&mod->dev_table_buf,

			   "MODULE_ALIAS(\"acpi*:%s:*\");\n", id);

			   "MODULE_ALIAS(\"acpi*:%s:*\");\n", acpi_id);

	}

}
@@ -416,10 +422,17 @@ static void do_pnp_card_entries(void *symval, unsigned long size, 


			/* add an individual alias for every device entry */

			if (!dup) {

				char acpi_id[sizeof(card->devs[0].id)];

				int k;



				buf_printf(&mod->dev_table_buf,

					   "MODULE_ALIAS(\"pnp:d%s*\");\n", id);



				/* fix broken pnp bus lowercasing */

				for (k = 0; k < sizeof(acpi_id); k++)

					acpi_id[k] = toupper(id[k]);

				buf_printf(&mod->dev_table_buf,

					   "MODULE_ALIAS(\"acpi*:%s:*\");\n", id);

					   "MODULE_ALIAS(\"acpi*:%s:*\");\n", acpi_id);

			}

		}

	}