diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-26 11:38:21 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-26 11:38:21 +0300 |
| commit | 67102bd31b4e31abb0abbc390381212a2d65db72 (patch) | |
| tree | 904754c940eb87b951cf877f09074a7d28bc2947 /sound/soc/atmel/mchp-spdiftx.c | |
| parent | ad5dbfc123e6ffbbde194e2a4603323e09f741ee (diff) | |
| parent | f76349cf41451c5c42a99f18a9163377e4b364ff (diff) | |
| download | linux-67102bd31b4e31abb0abbc390381212a2d65db72.tar.xz | |
Merge 6.0-rc7 into usb-next
We need the USB fixes in here for other follow-on changes to be able to
be applied successfully.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/atmel/mchp-spdiftx.c')
| -rw-r--r-- | sound/soc/atmel/mchp-spdiftx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/atmel/mchp-spdiftx.c b/sound/soc/atmel/mchp-spdiftx.c index 4850a177803d..ab2d7a791f39 100644 --- a/sound/soc/atmel/mchp-spdiftx.c +++ b/sound/soc/atmel/mchp-spdiftx.c @@ -196,7 +196,7 @@ struct mchp_spdiftx_dev { struct clk *pclk; struct clk *gclk; unsigned int fmt; - int gclk_enabled:1; + unsigned int gclk_enabled:1; }; static inline int mchp_spdiftx_is_running(struct mchp_spdiftx_dev *dev) |