Merge "soc: qcom: Fix error handling in PIL driver probe" (352c5308) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/soc/qcom/subsystem_restart.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1614,7 +1614,7 @@ static int __get_smem_state(struct subsys_desc desc, const char prop,
		desc->state = qcom_smem_state_get(desc->dev, prop, smem_bit);
		if (IS_ERR_OR_NULL(desc->state)) {
		pr_err("Could not get smem-states %s\n", prop);
		return -ENXIO;
		return PTR_ERR(desc->state);
		}
		return 0;
		}
		@@ -1919,6 +1919,7 @@ struct subsys_device subsys_register(struct subsys_desc desc)
		if (ofnode)
		subsys_remove_restart_order(ofnode);
		err_register:
		subsys_char_device_remove(subsys);
		device_unregister(&subsys->dev);
		return ERR_PTR(ret);
		}