diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-03-18 07:39:08 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-03-18 07:39:08 +0100 |
commit | d351cf4603edb2a5bfa9a48d06c425511c63f2a3 (patch) | |
tree | b03ea3cfd3ca3974237563cf87328386c3d49ff1 /sound/core/oss/linear.c | |
parent | 433e8327caf9f7c0432b2f2f6684a5b79cfe18e9 (diff) | |
parent | 4a122c10fbfe9020df469f0f669da129c5757671 (diff) | |
download | kernel_samsung_smdk4412-d351cf4603edb2a5bfa9a48d06c425511c63f2a3.zip kernel_samsung_smdk4412-d351cf4603edb2a5bfa9a48d06c425511c63f2a3.tar.gz kernel_samsung_smdk4412-d351cf4603edb2a5bfa9a48d06c425511c63f2a3.tar.bz2 |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/core/oss/linear.c')
-rw-r--r-- | sound/core/oss/linear.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c index 4c1d168..13b3f6f 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, return frames; } -static void init_data(struct linear_priv *data, int src_format, int dst_format) +static void init_data(struct linear_priv *data, + snd_pcm_format_t src_format, snd_pcm_format_t dst_format) { int src_le, dst_le, src_bytes, dst_bytes; @@ -140,9 +141,9 @@ static void init_data(struct linear_priv *data, int src_format, int dst_format) if (snd_pcm_format_signed(src_format) != snd_pcm_format_signed(dst_format)) { if (dst_le) - data->flip = cpu_to_le32(0x80000000); + data->flip = (__force u32)cpu_to_le32(0x80000000); else - data->flip = cpu_to_be32(0x80000000); + data->flip = (__force u32)cpu_to_be32(0x80000000); } } |