aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core/oss/linear.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/core/oss/linear.c')
-rw-r--r--sound/core/oss/linear.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c
index 4c1d1682719..13b3f6f49fa 100644
--- a/sound/core/oss/linear.c
+++ b/sound/core/oss/linear.c
@@ -114,7 +114,8 @@ static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin,
114 return frames; 114 return frames;
115} 115}
116 116
117static void init_data(struct linear_priv *data, int src_format, int dst_format) 117static void init_data(struct linear_priv *data,
118 snd_pcm_format_t src_format, snd_pcm_format_t dst_format)
118{ 119{
119 int src_le, dst_le, src_bytes, dst_bytes; 120 int src_le, dst_le, src_bytes, dst_bytes;
120 121
@@ -140,9 +141,9 @@ static void init_data(struct linear_priv *data, int src_format, int dst_format)
140 if (snd_pcm_format_signed(src_format) != 141 if (snd_pcm_format_signed(src_format) !=
141 snd_pcm_format_signed(dst_format)) { 142 snd_pcm_format_signed(dst_format)) {
142 if (dst_le) 143 if (dst_le)
143 data->flip = cpu_to_le32(0x80000000); 144 data->flip = (__force u32)cpu_to_le32(0x80000000);
144 else 145 else
145 data->flip = cpu_to_be32(0x80000000); 146 data->flip = (__force u32)cpu_to_be32(0x80000000);
146 } 147 }
147} 148}
148 149