Skip to content

Commit a902fa8

Browse files
committed
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: Arnd Bergmann <arnd@arndb.de>
2 parents 2058dc8 + a57f68d commit a902fa8

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

include/linux/reset.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ static inline int __must_check
731731
devm_reset_control_bulk_get_optional_exclusive(struct device *dev, int num_rstcs,
732732
struct reset_control_bulk_data *rstcs)
733733
{
734-
return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs, true, false, true);
734+
return __devm_reset_control_bulk_get(dev, num_rstcs, rstcs, false, true, true);
735735
}
736736

737737
/**

0 commit comments

Comments
 (0)