Unverified Commit a902fa8e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Reset controller fixes for v5.19

Fix the MAINTAINERS entry for the Synopsys AXS10x reset controller
driver, which still points to a nonexistent .txt file after the device
tree binding .yaml conversion.
Also, fix the devm_reset_control_bulk_get_optional_exclusive() call,
which was defective since its introduction due to a copy & paste error.

* tag 'reset-fixes-for-v5.19' of git://git.pengutronix.de/pza/linux:
  reset: Fix devm bulk optional exclusive control getter
  MAINTAINERS: rectify entry for SYNOPSYS AXS10x RESET CONTROLLER DRIVER

Link: https://lore.kernel.org/r/20220707101344.3329314-1-p.zabel@pengutronix.de


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2058dc83 a57f68dd

include/linux/reset.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -731,7 +731,7 @@ static inline int __must_check 
devm_reset_control_bulk_get_optional_exclusive(struct device *dev, int num_rstcs,

devm_reset_control_bulk_get_optional_exclusive(struct device *dev, int num_rstcs,

					       struct reset_control_bulk_data *rstcs)

					       struct reset_control_bulk_data *rstcs)

{

{

	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs, true, false, true);

	return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs, false, true, true);

}

}





/**

/**