Merge "power: smb-lib: Fix mutex deadlock during PD hard reset"

		return 0;

		return 0;

	chg->cc2_detach_wa_active = false;

	chg->cc2_detach_wa_active = false;

	chg->in_chg_lock = true;

	cancel_work_sync(&chg->rdstd_cc2_detach_work);

	cancel_work_sync(&chg->rdstd_cc2_detach_work);

	chg->in_chg_lock = false;

	smblib_reg_block_restore(chg, cc2_detach_settings);

	smblib_reg_block_restore(chg, cc2_detach_settings);

	return 0;

	return 0;

}

}

{

{

	int rc;

	int rc;

	u8 stat4, stat5;

	u8 stat4, stat5;

	bool lock = false;

	struct smb_charger *chg = container_of(work, struct smb_charger,

	struct smb_charger *chg = container_of(work, struct smb_charger,

						rdstd_cc2_detach_work);

						rdstd_cc2_detach_work);

	 * during pd_hard_reset from the function smblib_cc2_sink_removal_exit

	 * during pd_hard_reset from the function smblib_cc2_sink_removal_exit

	 * which is called in the same lock context that we try to acquire in

	 * which is called in the same lock context that we try to acquire in

	 * this work routine.

	 * this work routine.

	 * Check if this work is running during pd_hard_reset and use trylock

	 * Check if this work is running during pd_hard_reset and skip holding

	 * instead of mutex_lock to prevent any deadlock if mutext is already

	 * mutex if lock is already held.

	 * held.

	 */

	 */

	if (chg->pd_hard_reset) {

	if (!chg->in_chg_lock)

		if (mutex_trylock(&chg->lock))

			lock = true;

	} else {

		mutex_lock(&chg->lock);

		mutex_lock(&chg->lock);

		lock = true;

	}

	smblib_usb_typec_change(chg);

	smblib_usb_typec_change(chg);

	if (!chg->in_chg_lock)

	if (lock)

		mutex_unlock(&chg->lock);

		mutex_unlock(&chg->lock);

	return;

	return;

rerun:

rerun:

	bool			otg_present;

	bool			otg_present;

	bool			is_audio_adapter;

	bool			is_audio_adapter;

	bool			disable_stat_sw_override;

	bool			disable_stat_sw_override;

	bool			in_chg_lock;

	/* workaround flag */

	/* workaround flag */

	u32			wa_flags;

	u32			wa_flags;