diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-27 21:49:35 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-27 21:49:35 +0300 |
commit | 97b2ff294381d05e59294a931c4db55276470cb5 (patch) | |
tree | 72d984bfed5b06317557cc9cf1e12455c1f70abc /drivers/staging/iio/resolver | |
parent | b39667abcdcc754e32a0eb0df9cf49d45333d4ae (diff) | |
parent | 3fac2397f562eb669ddc2f45867a253f3fc26184 (diff) | |
download | linux-97b2ff294381d05e59294a931c4db55276470cb5.tar.xz |
Merge tag 'staging-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH:
"Here is the large set of staging driver updates for 6.4-rc1. Once
again, we removed more code than was added, a nice trend.
It was a calm cycle, mostly all just small coding style cleanups,
included in here are:
- removal of the greybus loopback testing tools, userspace code that
didn't belong in a driver subdirectory and was causing problems for
some build systems
- platform remove callback cleanups
- rtl8192e huge cleanups
- other small staging driver cleanups.
All of these have been in linux-next for a while with no reported
problems"
* tag 'staging-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (185 commits)
staging: rtl8192e: Fix W_DISABLE# does not work after stop/start
staging: rtl8192e: Remove unchanged variables bfsync_processing and more
staging: rtl8192e: Remove unchanged variable frame_sync_monitor
staging: rtl8192e: Remove unchanged variable chan_forced
staging: rtl8192e: Remove set to true while true of bfirst_after_down
staging: rtl8192e: Remove second initialization of bActuallySet
staging: rtl8192e: Remove unused macro RT_SET_PS_LEVEL
staging: rtl8192e: Remove unused function rtl92e_disable_nic
staging: rtl8192e: Remove unchanged variable RegRfPsLevel
staging: rtl8172: Add blank lines after declarations
staging: rtl8192e: Remove unused variable RF_Type
staging: rtl8192e: Remove one of two checks for hardware RTL8192SE
staging: rtl8192e: Remove unused function _rtl92e_dm_init_wa_broadcom_iot
staging: rtl8192e: Remove macro IS_HARDWARE_TYPE_8192SE
staging: greybus: drop loopback test files
staging: rtl8192e: Add blank lines after declarations
staging: rtl8192e: avoid CamelCase <dot11RSNAStatsCCMPDecryptErrors>
staging: rtl8192e: avoid CamelCase <dot11RSNAStatsCCMPReplays>
staging: rtl8192e: avoid CamelCase <dot11RSNAStatsCCMPFormatErrors>
staging: rtl8192e: fix alignment to match open parenthesis
...
Diffstat (limited to 'drivers/staging/iio/resolver')
-rw-r--r-- | drivers/staging/iio/resolver/ad2s1210.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c index eb364639fa58..06de5823eb8e 100644 --- a/drivers/staging/iio/resolver/ad2s1210.c +++ b/drivers/staging/iio/resolver/ad2s1210.c @@ -102,7 +102,7 @@ struct ad2s1210_state { static const int ad2s1210_mode_vals[4][2] = { [MOD_POS] = { 0, 0 }, [MOD_VEL] = { 0, 1 }, - [MOD_CONFIG] = { 1, 0 }, + [MOD_CONFIG] = { 1, 1 }, }; static inline void ad2s1210_set_mode(enum ad2s1210_mode mode, |