UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes in the mellanox init branch due for v6.6. 

platform-drivers-x86-mellanox-init-v6.6: v6.6-rc1 + fixes in
 the platform-drivers-x86-mellanox-init branch to avoid a feature
 conflict during the v6.7 merge window.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQSCSUwRdwTNL2MhaBlZrE9hU+XOMQUCZSAa3gAKCRBZrE9hU+XO
 Mbw7AQDJPBXR+D57BCwOPuVcKi85vdhD1YUYduxG3wNWCnKdwQEAryfhqIAc/M0J
 /O8diYEh43siyITp+K6t13EAX3V8bgU=
 =KJnN
 -----END PGP SIGNATURE-----

Merge tag 'platform-drivers-x86-mellanox-init-v6.6' into fixes

Fixes in the mellanox init branch due for v6.6.

platform-drivers-x86-mellanox-init-v6.6: v6.6-rc1 + fixes in
the platform-drivers-x86-mellanox-init branch to avoid a feature
conflict during the v6.7 merge window.
This commit is contained in:
Hans de Goede 2023-10-11 11:16:33 +02:00
parent 5b44abbc39 7ec4cd3c1a
commit a4fdebbe06
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/platform/x86/mlx-platform.c
View File

@ -6514,6 +6514,7 @@ static int mlxplat_i2c_main_init(struct mlxplat_priv *priv)
return 0; return 0;
fail_mlxplat_i2c_mux_topology_init: fail_mlxplat_i2c_mux_topology_init:
platform_device_unregister(priv->pdev_i2c);
fail_platform_i2c_register: fail_platform_i2c_register:
fail_mlxplat_mlxcpld_verify_bus_topology: fail_mlxplat_mlxcpld_verify_bus_topology:
return err; return err;
@ -6521,6 +6522,7 @@ fail_mlxplat_mlxcpld_verify_bus_topology:
static void mlxplat_i2c_main_exit(struct mlxplat_priv *priv) static void mlxplat_i2c_main_exit(struct mlxplat_priv *priv)
{ {
mlxplat_pre_exit(priv);
mlxplat_i2c_mux_topology_exit(priv); mlxplat_i2c_mux_topology_exit(priv);
if (priv->pdev_i2c) if (priv->pdev_i2c)
platform_device_unregister(priv->pdev_i2c); platform_device_unregister(priv->pdev_i2c);
@ -6597,7 +6599,7 @@ static int mlxplat_probe(struct platform_device *pdev)
fail_register_reboot_notifier: fail_register_reboot_notifier:
fail_regcache_sync: fail_regcache_sync:
mlxplat_pre_exit(priv); mlxplat_i2c_main_exit(priv);
fail_mlxplat_i2c_main_init: fail_mlxplat_i2c_main_init:
fail_regmap_write: fail_regmap_write:
fail_alloc: fail_alloc:
@ -6614,7 +6616,6 @@ static int mlxplat_remove(struct platform_device *pdev)
pm_power_off = NULL; pm_power_off = NULL;
if (mlxplat_reboot_nb) if (mlxplat_reboot_nb)
unregister_reboot_notifier(mlxplat_reboot_nb); unregister_reboot_notifier(mlxplat_reboot_nb);
mlxplat_pre_exit(priv);
mlxplat_i2c_main_exit(priv); mlxplat_i2c_main_exit(priv);
mlxplat_post_exit(); mlxplat_post_exit();
return 0; return 0;