Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-1
+5
-1
drivers/firmware/dmi-id.c
+5
-1
drivers/firmware/dmi-id.c
···
73
73
74
74
static ssize_t get_modalias(char *buffer, size_t buffer_size)
75
75
{
76
+
/*
77
+
* Note new fields need to be added at the end to keep compatibility
78
+
* with udev's hwdb which does matches on "`cat dmi/id/modalias`*".
79
+
*/
76
80
static const struct mafield {
77
81
const char *prefix;
78
82
int field;
···
89
85
{ "svn", DMI_SYS_VENDOR },
90
86
{ "pn", DMI_PRODUCT_NAME },
91
87
{ "pvr", DMI_PRODUCT_VERSION },
92
-
{ "sku", DMI_PRODUCT_SKU },
93
88
{ "rvn", DMI_BOARD_VENDOR },
94
89
{ "rn", DMI_BOARD_NAME },
95
90
{ "rvr", DMI_BOARD_VERSION },
96
91
{ "cvn", DMI_CHASSIS_VENDOR },
97
92
{ "ct", DMI_CHASSIS_TYPE },
98
93
{ "cvr", DMI_CHASSIS_VERSION },
94
+
{ "sku", DMI_PRODUCT_SKU },
99
95
{ NULL, DMI_NONE }
100
96
};
101
97