Skip to contentSkip to conversation

Patch "iio: st_magn: always define ST_MAGN_TRIGGER_SET_STATE" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Apr 17, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

iio: st_magn: always define ST_MAGN_TRIGGER_SET_STATE

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
iio-st_magn-always-define-st_magn_trigger_set_state.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 9b090a98e95c2530ef0ce474e3b6218621b8ae25 Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Tue, 29 Mar 2016 22:27:27 +0200
Subject: iio: st_magn: always define ST_MAGN_TRIGGER_SET_STATE

From: Arnd Bergmann <[email protected]>

commit 9b090a98e95c2530ef0ce474e3b6218621b8ae25 upstream.

When CONFIG_IIO_TRIGGER is enabled but CONFIG_IIO_BUFFER is not, we get a build error in the st_magn driver:

drivers/iio/magnetometer/st_magn_core.c:573:23: error: 'ST_MAGN_TRIGGER_SET_STATE' undeclared here (not in a function)
.set_trigger_state = ST_MAGN_TRIGGER_SET_STATE,

                       ^~~~~~~~~~~~~~~~~~~~~~~~~

Apparently, this ST_MAGN_TRIGGER_SET_STATE macro was meant to be set to NULL when the definition is not available because st_magn_buffer.c is not compiled, but the alternative definition was not included in the original patch. This adds it.

Fixes 74f5683f35fe ("iio: st_magn: Add irq trigger handling")
---
 drivers/iio/magnetometer/st_magn.h |    1 +
 1 file changed, 1 insertion(+)
drivers/iio/magnetometer/st_magn.h +1 -0
@@ -44,6 +44,7 @@ static inline int st_magn_allocate_ring(
 static inline void st_magn_deallocate_ring(struct iio_dev *indio_dev)
 {
 }
+#define ST_MAGN_TRIGGER_SET_STATE NULL
 #endif /* CONFIG_IIO_BUFFER */
 
 #endif /* ST_MAGN_H */

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/mac80211-avoid-excessive-stack-usage-in-sta_info.patch queue-4.4/farsync-fix-off-by-one-bug-in-fst_add_one.patch queue-4.4/pcmcia-db1xxx_ss-fix-last-irq_to_gpio-user.patch queue-4.4/ath9k-fix-buffer-overrun-for-ar9287.patch queue-4.4/iio-st_magn-always-define-st_magn_trigger_set_state.patch queue-4.4/hwmon-max1111-return-enodev-from-max1111_read_channel-if-not-instantiated.patch queue-4.4/mlx4-add-missing-braces-in-verify_qp_parameters.patch