Merge tag 'mhi-fixes-for-v6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-linus

Manivannan writes:

MHI Host
========

- Use pci_try_reset_function() to reset the MHI function during recovery process
to avoid the deadlock reported on the X1E80100 CRD device. The deadlock can
happen if the caller has already acquired the 'device_lock()' while calling
the recovery function. So using pci_try_reset_function() avoids the deadlock
by returning -EAGAIN if the lock was already acquired.

* tag 'mhi-fixes-for-v6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi:
bus: mhi: host: pci_generic: Use pci_try_reset_function() to avoid deadlock

+3 -2
+3 -2
drivers/bus/mhi/host/pci_generic.c
··· 1095 1095 err_unprepare: 1096 1096 mhi_unprepare_after_power_down(mhi_cntrl); 1097 1097 err_try_reset: 1098 - if (pci_reset_function(pdev)) 1099 - dev_err(&pdev->dev, "Recovery failed\n"); 1098 + err = pci_try_reset_function(pdev); 1099 + if (err) 1100 + dev_err(&pdev->dev, "Recovery failed: %d\n", err); 1100 1101 } 1101 1102 1102 1103 static void health_check(struct timer_list *t)