diff options
Diffstat (limited to 'drivers/firmware')
-rw-r--r-- | drivers/firmware/dmi_scan.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 948bd7e1445a..b9e3886d9e16 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c | |||
@@ -255,10 +255,15 @@ void __init dmi_scan_machine(void) | |||
255 | /** | 255 | /** |
256 | * dmi_check_system - check system DMI data | 256 | * dmi_check_system - check system DMI data |
257 | * @list: array of dmi_system_id structures to match against | 257 | * @list: array of dmi_system_id structures to match against |
258 | * All non-null elements of the list must match | ||
259 | * their slot's (field index's) data (i.e., each | ||
260 | * list string must be a substring of the specified | ||
261 | * DMI slot's string data) to be considered a | ||
262 | * successful match. | ||
258 | * | 263 | * |
259 | * Walk the blacklist table running matching functions until someone | 264 | * Walk the blacklist table running matching functions until someone |
260 | * returns non zero or we hit the end. Callback function is called for | 265 | * returns non zero or we hit the end. Callback function is called for |
261 | * each successfull match. Returns the number of matches. | 266 | * each successful match. Returns the number of matches. |
262 | */ | 267 | */ |
263 | int dmi_check_system(struct dmi_system_id *list) | 268 | int dmi_check_system(struct dmi_system_id *list) |
264 | { | 269 | { |
@@ -287,7 +292,7 @@ EXPORT_SYMBOL(dmi_check_system); | |||
287 | 292 | ||
288 | /** | 293 | /** |
289 | * dmi_get_system_info - return DMI data value | 294 | * dmi_get_system_info - return DMI data value |
290 | * @field: data index (see enum dmi_filed) | 295 | * @field: data index (see enum dmi_field) |
291 | * | 296 | * |
292 | * Returns one DMI data value, can be used to perform | 297 | * Returns one DMI data value, can be used to perform |
293 | * complex DMI data checks. | 298 | * complex DMI data checks. |
@@ -301,13 +306,13 @@ EXPORT_SYMBOL(dmi_get_system_info); | |||
301 | /** | 306 | /** |
302 | * dmi_find_device - find onboard device by type/name | 307 | * dmi_find_device - find onboard device by type/name |
303 | * @type: device type or %DMI_DEV_TYPE_ANY to match all device types | 308 | * @type: device type or %DMI_DEV_TYPE_ANY to match all device types |
304 | * @desc: device name string or %NULL to match all | 309 | * @name: device name string or %NULL to match all |
305 | * @from: previous device found in search, or %NULL for new search. | 310 | * @from: previous device found in search, or %NULL for new search. |
306 | * | 311 | * |
307 | * Iterates through the list of known onboard devices. If a device is | 312 | * Iterates through the list of known onboard devices. If a device is |
308 | * found with a matching @vendor and @device, a pointer to its device | 313 | * found with a matching @vendor and @device, a pointer to its device |
309 | * structure is returned. Otherwise, %NULL is returned. | 314 | * structure is returned. Otherwise, %NULL is returned. |
310 | * A new search is initiated by passing %NULL to the @from argument. | 315 | * A new search is initiated by passing %NULL as the @from argument. |
311 | * If @from is not %NULL, searches continue from next device. | 316 | * If @from is not %NULL, searches continue from next device. |
312 | */ | 317 | */ |
313 | struct dmi_device * dmi_find_device(int type, const char *name, | 318 | struct dmi_device * dmi_find_device(int type, const char *name, |