Reset controller fixes for v6.2

Avoid a build error by disabling the invalid combination of building
 reset-ti-sci built-in but ti-sci as a module.
 Fix a possible NULL pointer dereference in reset-uniphier-glue in case
 platform_get_resource() fails.
 -----BEGIN PGP SIGNATURE-----
 
 iI0EABYIADUWIQRRO6F6WdpH1R0vGibVhaclGDdiwAUCY7VMThcccC56YWJlbEBw
 ZW5ndXRyb25peC5kZQAKCRDVhaclGDdiwDBIAQCh6Cc1gJtYi08WbF3nGB3ojKAz
 +ciz6F8gBhXMphCahAEAoFpMjiIjkxvN5e1E+Rvxix5DzUJoteVtE1fIOtrNjAg=
 =PQAz
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmO8kikACgkQmmx57+YA
 GNktLQ//SdDorslDy/GfR46tZddaruMo3AXQ84zOjVz0cQOH613nTE5P487b8+y+
 h+MIW6KJQNgwLi7zLAF0SVZjV50LkF7ic52IyZlaVbri6sMsoVEm0jIp8UWVy5bU
 JV23VWd4kpgoNvK6b0QlhrytU3AVV1oZfbK+PJoINMPZUM76qwKijASH0778c7AF
 jWrPQE3jCQ4UqudfBq8PAcu/j5ALp4GKkWSIiqFlesho/lCG+Ycto0tTPUfPDCFL
 lmv2sdiUIv5X5Y/MkB99DH/nTY81LlmIs3KHD22QYMDrqE6R2vX3OiQ/bfKcCvPg
 KAA96+XLXuWUZAc3ldJIDAZ++fsEFvyPLAg74uFZVgqcUEFYoh07WOVJpAbTYOSN
 kJ49k+LtI/58iOoekjj+/95/pD3lg5HE87N2XIw199AhA8fIW+oKIrq7aYlECHjS
 FN7871/Jtt45QACYCmtWM0YmDmRI1gaGLbXRdvEtyK4U5h4nh8HRkxdVk+DcB83W
 2glSqpgIPnKtqgDSg/14dv4p5BaLd5v8Cm6GFavfAGBJSrHBr2ZFguV74i9ixVUJ
 AoXFlguO0G1OrYsfppW7bF1ThgebBV88F4ESxeLyWnP4VOhnJdo8Yg1i/2FQyN+q
 iPIvlDOpBFuOyMqIZhYeSe/hCroZ3OWA2xhv2B32g/m1HK/HCIk=
 =Q4/c
 -----END PGP SIGNATURE-----

Merge tag 'reset-fixes-for-v6.2' of git://git.pengutronix.de/pza/linux into arm/fixes

Reset controller fixes for v6.2

Avoid a build error by disabling the invalid combination of building
reset-ti-sci built-in but ti-sci as a module.
Fix a possible NULL pointer dereference in reset-uniphier-glue in case
platform_get_resource() fails.

* tag 'reset-fixes-for-v6.2' of git://git.pengutronix.de/pza/linux:
  reset: uniphier-glue: Fix possible null-ptr-deref
  reset: ti-sci: honor TI_SCI_PROTOCOL setting when not COMPILE_TEST

Link: https://lore.kernel.org/r/20230104095855.3809733-1-p.zabel@pengutronix.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-01-09 23:16:08 +01:00
commit 97bcdf24e0
2 changed files with 2 additions and 4 deletions