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

Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

Pull dmi fix from Jean Delvare.

Unbreak some existing udev/hwdb modalias matches due to misplaced
product_sku field.

* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  firmware: dmi: Move product_sku info to the end of the modalias
parents 1735715e f97a2103

drivers/firmware/dmi-id.c

+5 −1
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ static void ascii_filter(char *d, const char *s) 


static ssize_t get_modalias(char *buffer, size_t buffer_size)

{

	/*

	 * Note new fields need to be added at the end to keep compatibility

	 * with udev's hwdb which does matches on "`cat dmi/id/modalias`*".

	 */

	static const struct mafield {

		const char *prefix;

		int field;
@@ -85,13 +89,13 @@ static ssize_t get_modalias(char *buffer, size_t buffer_size) 
		{ "svn", DMI_SYS_VENDOR },

		{ "pn",  DMI_PRODUCT_NAME },

		{ "pvr", DMI_PRODUCT_VERSION },

		{ "sku", DMI_PRODUCT_SKU },

		{ "rvn", DMI_BOARD_VENDOR },

		{ "rn",  DMI_BOARD_NAME },

		{ "rvr", DMI_BOARD_VERSION },

		{ "cvn", DMI_CHASSIS_VENDOR },

		{ "ct",  DMI_CHASSIS_TYPE },

		{ "cvr", DMI_CHASSIS_VERSION },

		{ "sku", DMI_PRODUCT_SKU },

		{ NULL,  DMI_NONE }

	};