From 478d5618b4087ade81cb56c1c5370db3c77e01c0 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 9 Feb 2020 22:25:53 -0500 Subject: [PATCH] fixes for 5.4 Signed-off-by: Sasha Levin --- ...r-regulator-core-add-regulator_is_eq.patch | 34 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 35 insertions(+) create mode 100644 queue-5.4/regulator-fix-for-regulator-core-add-regulator_is_eq.patch diff --git a/queue-5.4/regulator-fix-for-regulator-core-add-regulator_is_eq.patch b/queue-5.4/regulator-fix-for-regulator-core-add-regulator_is_eq.patch new file mode 100644 index 00000000000..36755858e27 --- /dev/null +++ b/queue-5.4/regulator-fix-for-regulator-core-add-regulator_is_eq.patch @@ -0,0 +1,34 @@ +From 2353e146cee9a02b350784c967ab1cadd2a81cde Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 15 Jan 2020 12:02:58 +1100 +Subject: regulator fix for "regulator: core: Add regulator_is_equal() helper" + +From: Stephen Rothwell + +[ Upstream commit 0468e667a5bead9c1b7ded92861b5a98d8d78745 ] + +Signed-off-by: Stephen Rothwell +Link: https://lore.kernel.org/r/20200115120258.0e535fcb@canb.auug.org.au +Acked-by: Marek Vasut +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + include/linux/regulator/consumer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h +index 2c89d886595cb..6a92fd3105a31 100644 +--- a/include/linux/regulator/consumer.h ++++ b/include/linux/regulator/consumer.h +@@ -596,7 +596,7 @@ regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers, + } + + static inline bool +-regulator_is_equal(struct regulator *reg1, struct regulator *reg2); ++regulator_is_equal(struct regulator *reg1, struct regulator *reg2) + { + return false; + } +-- +2.20.1 + diff --git a/queue-5.4/series b/queue-5.4/series index 4564c446ee0..af95776cac9 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -305,3 +305,4 @@ x86-apic-msi-plug-non-maskable-msi-affinity-race.patch clocksource-prevent-double-add_timer_on-for-watchdog_timer.patch perf-core-fix-mlock-accounting-in-perf_mmap.patch rxrpc-fix-service-call-disconnection.patch +regulator-fix-for-regulator-core-add-regulator_is_eq.patch -- 2.47.3