i2c-for-6.15-rc7

- designware: cleanup properly on probe failure
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEOZGx6rniZ1Gk92RdFA3kzBSgKbYFAmgoUF4ACgkQFA3kzBSg
 KbZDWA//RGN8BV7jrGSSnQRvbsj5OU5Phtl81vE/XTppx+9Q/Pygr8a48kRxjJGv
 sSKKOtRdK1lyYfE+I7Icknq3Z5EG3p3MYD9Z/bUB4MhhvYtGPymS7jnkQuVrCaVR
 l9EEGXZg5E6sn1PhifXwHpb3ro9B+QCwJ8ja7U9J8HV+pxEeYvm4wOOpVw3ECxP8
 mE4e3BySnGlHmV01DWzw7+a+jrryyKt7lyzrkuOsN+w2leNGiI8C4sQJ0FkZ40go
 vJNAQ6t4Ib69no+36KbExpnPWz40lNBgssLHmI736YASwXPd4RytKTgKUprvQdtc
 3PKoBG14Y9EHnHQJ5oPnY3m/A+WDkFUJh1cYQtJ12OXViYaAo7SdwtRgI1kYPAis
 tzKr/NvO4M7q3DbIGLYEGilYFdUkmuPN+jCUTICAcUd0f7nx0+/rG7A6/R60/rdw
 pm8K8XFYEqbzjg6EMRvReYlsWYmy5ebdkRZpeNuw1Yen4/d4KM3d3/qRrt+ApH3k
 2IP+9LPyWtj1OlX/84ybK6FnYR46ZAwviIDiGNkOU5Gu8ct8DCPCvSD7VhAIiOxs
 zXrfVCnSmQEzuVpZiamkTEMf4m2oRwuogZaj/gnBg0+UbaMDpHCqx3cKYhKn1Mzk
 quJGSIAUdJ8YMrvn8ZtDBL9cD+lpnJWZqyErmRh3M14Vgi0HtJY=
 =ptSK
 -----END PGP SIGNATURE-----

Merge tag 'i2c-for-6.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fix from Wolfram Sang:

 - designware: cleanup properly on probe failure

* tag 'i2c-for-6.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: designware: Fix an error handling path in i2c_dw_pci_probe()
This commit is contained in:
Linus Torvalds 2025-05-17 07:46:42 -07:00
commit a1317e1cb2

View File

@ -278,9 +278,11 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
if ((dev->flags & MODEL_MASK) == MODEL_AMD_NAVI_GPU) {
dev->slave = i2c_new_ccgx_ucsi(&dev->adapter, dev->irq, &dgpu_node);
if (IS_ERR(dev->slave))
if (IS_ERR(dev->slave)) {
i2c_del_adapter(&dev->adapter);
return dev_err_probe(device, PTR_ERR(dev->slave),
"register UCSI failed\n");
}
}
pm_runtime_set_autosuspend_delay(device, 1000);