RISC-V soc fixes for v7.1-rc7
Microchip: Fix a resource leak in an unlikely probe failure case. Signed-off-by: Conor Dooley <conor.dooley@microchip.com> -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCah6erQAKCRB4tDGHoIJi 0lWTAP9Ln7YvO/DPfkvbVketh2eyTbX5pJUwMQsWC4XgAy3fhQEAuDEzog9im2f9 S32r+ff9FGcuPKvF1e7xWsjB7BV5Agc= =Ld8o -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmonvawACgkQmmx57+YA GNka3w//TA91dob5AjXCQt+tT93yVj10ONwA5D6Ix0z+Z6QoNgk+AM+k3T7quz4U zbsZ8x29G3K0Twk1VZn4nEZXGz6HEdnad9VQ1IZy4Gv9bLWK8HJsQypnVZdGwYPc WIAXdUIrTS6U0YfPlqLicE3o07ltNu+g5OHhtU47PFi60HLnE7U8H/rl2lTe+XgL FPvjr06M5AmyJp85oKiiAxaKtHE9P4fm1TeQ/3BfSQI6kTrsDhcw4pl7d2LXKn0M yPL0YiZQXpBEdYAMoRrEQG3eLDISd/dMbKobQg1/82S29VMx6Vk2/PGTeDezxQ/d dWtMjuHnb1aY7FBR9He+mZasPtxEMufiKYDSaV0UXoW052xJxz4xUDlZAa0AAiq7 MzbjE6gbM5eBEB+s+VJvoeh+6PrhFHds3TRD65wsdOmNVuUWKKYEIS0ZLHrOt50T aS2tchRUrn+ls+T6YCkwq3Uhqz4LvlEA+2c+9DiBBSxrSuXuQZ0PtfESp+x4qPk0 eQ7RlHeMggnswLIcfnY4KSLCHhTFXF3TM2JJV9pHw7ulFDwRLAL5hlrYVEclT6UI prX1t37kts5fCkApifLb63vpolTOqEDRyMP/bDjB/rjv1SXPMx9cvqXRzAKakozF VG3fPRTELdufTUflLn3aFZPNarB9v8/GGQAVVUo/97Bw8GNvBQA= =Nvnp -----END PGP SIGNATURE----- Merge tag 'riscv-soc-fixes-for-v7.1-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes RISC-V soc fixes for v7.1-rc7 Microchip: Fix a resource leak in an unlikely probe failure case. Signed-off-by: Conor Dooley <conor.dooley@microchip.com> * tag 'riscv-soc-fixes-for-v7.1-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux: soc: microchip: mpfs-sys-controller: fix resource leak on probe error Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
2736a79052
1 changed files with 4 additions and 2 deletions
|
|
@ -158,8 +158,8 @@ no_flash:
|
|||
|
||||
of_data = (struct mpfs_syscon_config *) device_get_match_data(dev);
|
||||
if (!of_data) {
|
||||
dev_err(dev, "Error getting match data\n");
|
||||
return -EINVAL;
|
||||
ret = dev_err_probe(dev, -EINVAL, "Error getting match data\n");
|
||||
goto out_free_channel;
|
||||
}
|
||||
|
||||
for (i = 0; i < of_data->nb_subdevs; i++) {
|
||||
|
|
@ -173,6 +173,8 @@ no_flash:
|
|||
|
||||
return 0;
|
||||
|
||||
out_free_channel:
|
||||
mbox_free_channel(sys_controller->chan);
|
||||
out_free:
|
||||
kfree(sys_controller);
|
||||
return ret;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue