mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
This is the 5.4.277 stable release
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmZR8vIACgkQONu9yGCS aT4p4BAAh4+a0Jkrf2h0QKSQq+OP4yATIzoGWzNDXrrJC5t9g7clDgGxZCj0vz31 klLc8Jbw0vgjPmzI1w/jfdgw/0o4CMc7K1kvYHa8V0sNxeH6aE0VfETMAhgEDHoX vX6pMoYkLsc5Yd5uKnaL2MXfV0agEuvupJq/C4yY2JOHrPsRnFPpqgqDNIlAZ6a7 7k7QY/CYK7lqVnbFWxdH2wlJKRupAMmx0rdeCIMAN6GTl/ON+pWbPG2PKta25j4F 25M4S25OINX9rPg5b27OMSzwoqgCBDDNjVTUp4w7Kqbpt11D/xylv+DKZxRvwS4y UdMGFoo+sO/8IzROal40rCLaAIXnh1lYpjx/QMw3yNCjWXFgjD2yAzAZroLbWUXg v6px5lOE5U5b0OfjuuK9fTO8WzUESegLyNyE8aEz0ZFeOkXLWGmcLwOMyerl1bdA cLkfTC9rhTj9Q8O7+aBq9jJF5i3POWtV3weJEqJl4+RPSH61J4Ch1hROz+C59pqn mkbcjf4nggVBeK9tSca9LNu54AUIx12q4bmaTb/tauhL673favONReIR1JH+a30P luTuOiYnAGiG9M0/Qoq8BrZ8uF/BqdhLZjM584A3O1e/qAtirhEHvjonozANok7C XmXqq0Gm8u3Q31UnNoFoW8tLzkv5Za6Nto9tc+btc7vhjXYyPKs= =ao+L -----END PGP SIGNATURE----- Merge 5.4.277 into android11-5.4-lts Changes in 5.4.277 pinctrl: core: handle radix_tree_insert() errors in pinctrl_register_one_pin() ext4: fix bug_on in __es_tree_search Revert "selftests: mm: fix map_hugetlb failure on 64K page size systems" Revert "net: bcmgenet: use RGMII loopback for MAC reset" net: bcmgenet: keep MAC in reset until PHY is up net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access net: bcmgenet: synchronize use of bcmgenet_set_rx_mode() net: bcmgenet: synchronize UMAC_CMD access smb: client: fix potential OOBs in smb2_parse_contexts() firmware: arm_scmi: Harden accesses to the reset domains arm64: dts: qcom: Fix 'interrupt-map' parent address cells btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks() drm/amdgpu: Fix possible NULL dereference in amdgpu_ras_query_error_status_helper() usb: typec: ucsi: displayport: Fix potential deadlock serial: kgdboc: Fix NMI-safety problems from keyboard reset code docs: kernel_include.py: Cope with docutils 0.21 Linux 5.4.277 Change-Id: I7c64905bd76358d7f6f86f33522fb03811684946 Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
commit
4b533a5511
18 changed files with 161 additions and 99 deletions
|
|
@ -204,6 +204,7 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
|
|||
const struct pinctrl_pin_desc *pin)
|
||||
{
|
||||
struct pin_desc *pindesc;
|
||||
int error;
|
||||
|
||||
pindesc = pin_desc_get(pctldev, pin->number);
|
||||
if (pindesc) {
|
||||
|
|
@ -225,18 +226,25 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev,
|
|||
} else {
|
||||
pindesc->name = kasprintf(GFP_KERNEL, "PIN%u", pin->number);
|
||||
if (!pindesc->name) {
|
||||
kfree(pindesc);
|
||||
return -ENOMEM;
|
||||
error = -ENOMEM;
|
||||
goto failed;
|
||||
}
|
||||
pindesc->dynamic_name = true;
|
||||
}
|
||||
|
||||
pindesc->drv_data = pin->drv_data;
|
||||
|
||||
radix_tree_insert(&pctldev->pin_desc_tree, pin->number, pindesc);
|
||||
error = radix_tree_insert(&pctldev->pin_desc_tree, pin->number, pindesc);
|
||||
if (error)
|
||||
goto failed;
|
||||
|
||||
pr_debug("registered pin %d (%s) on %s\n",
|
||||
pin->number, pindesc->name, pctldev->desc->name);
|
||||
return 0;
|
||||
|
||||
failed:
|
||||
kfree(pindesc);
|
||||
return error;
|
||||
}
|
||||
|
||||
static int pinctrl_register_pins(struct pinctrl_dev *pctldev,
|
||||
|
|
|
|||
Loading…
Reference in a new issue