mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
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
This commit is contained in:
commit
dd183e3205
3 changed files with 10 additions and 3 deletions
|
@ -27,7 +27,7 @@
|
||||||
* Arbitrary retries in case the remote processor is slow to respond
|
* Arbitrary retries in case the remote processor is slow to respond
|
||||||
* to PCC commands
|
* to PCC commands
|
||||||
*/
|
*/
|
||||||
#define PCC_CMD_WAIT_RETRIES_NUM 500
|
#define PCC_CMD_WAIT_RETRIES_NUM 500ULL
|
||||||
|
|
||||||
struct pcc_data {
|
struct pcc_data {
|
||||||
struct pcc_mbox_chan *pcc_chan;
|
struct pcc_mbox_chan *pcc_chan;
|
||||||
|
|
|
@ -425,6 +425,13 @@ static const struct dmi_system_id asus_laptop[] = {
|
||||||
DMI_MATCH(DMI_BOARD_NAME, "S5402ZA"),
|
DMI_MATCH(DMI_BOARD_NAME, "S5402ZA"),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
.ident = "Asus Vivobook S5602ZA",
|
||||||
|
.matches = {
|
||||||
|
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
|
||||||
|
DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),
|
||||||
|
},
|
||||||
|
},
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -229,7 +229,7 @@ EXPORT_SYMBOL_GPL(device_property_read_string);
|
||||||
* Find a given string in a string array and if it is found return the
|
* Find a given string in a string array and if it is found return the
|
||||||
* index back.
|
* index back.
|
||||||
*
|
*
|
||||||
* Return: %0 if the property was found (success),
|
* Return: index, starting from %0, if the property was found (success),
|
||||||
* %-EINVAL if given arguments are not valid,
|
* %-EINVAL if given arguments are not valid,
|
||||||
* %-ENODATA if the property does not have a value,
|
* %-ENODATA if the property does not have a value,
|
||||||
* %-EPROTO if the property is not an array of strings,
|
* %-EPROTO if the property is not an array of strings,
|
||||||
|
@ -450,7 +450,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_read_string);
|
||||||
* Find a given string in a string array and if it is found return the
|
* Find a given string in a string array and if it is found return the
|
||||||
* index back.
|
* index back.
|
||||||
*
|
*
|
||||||
* Return: %0 if the property was found (success),
|
* Return: index, starting from %0, if the property was found (success),
|
||||||
* %-EINVAL if given arguments are not valid,
|
* %-EINVAL if given arguments are not valid,
|
||||||
* %-ENODATA if the property does not have a value,
|
* %-ENODATA if the property does not have a value,
|
||||||
* %-EPROTO if the property is not an array of strings,
|
* %-EPROTO if the property is not an array of strings,
|
||||||
|
|
Loading…
Reference in a new issue