Skip to content

Commit dd183e3

Browse files
committed
Merge branches 'acpi-resource', 'acpi-pcc' and 'devprop'
Merge an IRQ override quirk, an ACPI PCC code fix and a device properties documentation update for 6.1-rc3: - Make the ACPI device resources code skip IRQ override on Asus Vivobook S5602ZA (Tamim Khan). - Fix a possible integer overflow during multiplication in the ACPI PCC code (Manank Patel). - Fix the documentation of the *_match_string() family of functions to properly cover the return value (Andy Shevchenko). * acpi-resource: ACPI: resource: Skip IRQ override on Asus Vivobook S5602ZA * acpi-pcc: ACPI: PCC: Fix unintentional integer overflow * devprop: device property: Fix documentation for *_match_string() APIs
4 parents fa153b7 + b5f9223 + 8338b74 + 92e1046 commit dd183e3

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

drivers/acpi/acpi_pcc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* Arbitrary retries in case the remote processor is slow to respond
2828
* to PCC commands
2929
*/
30-
#define PCC_CMD_WAIT_RETRIES_NUM 500
30+
#define PCC_CMD_WAIT_RETRIES_NUM 500ULL
3131

3232
struct pcc_data {
3333
struct pcc_mbox_chan *pcc_chan;

drivers/acpi/resource.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,13 @@ static const struct dmi_system_id asus_laptop[] = {
425425
DMI_MATCH(DMI_BOARD_NAME, "S5402ZA"),
426426
},
427427
},
428+
{
429+
.ident = "Asus Vivobook S5602ZA",
430+
.matches = {
431+
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
432+
DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),
433+
},
434+
},
428435
{ }
429436
};
430437

drivers/base/property.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ EXPORT_SYMBOL_GPL(device_property_read_string);
229229
* Find a given string in a string array and if it is found return the
230230
* index back.
231231
*
232-
* Return: %0 if the property was found (success),
232+
* Return: index, starting from %0, if the property was found (success),
233233
* %-EINVAL if given arguments are not valid,
234234
* %-ENODATA if the property does not have a value,
235235
* %-EPROTO if the property is not an array of strings,
@@ -450,7 +450,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_string);
450450
* Find a given string in a string array and if it is found return the
451451
* index back.
452452
*
453-
* Return: %0 if the property was found (success),
453+
* Return: index, starting from %0, if the property was found (success),
454454
* %-EINVAL if given arguments are not valid,
455455
* %-ENODATA if the property does not have a value,
456456
* %-EPROTO if the property is not an array of strings,

0 commit comments

Comments
 (0)