diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-12-10 12:15:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 07:45:06 -0800 |
| commit | f4b017da47d8aa1a1ab0fd4ec04b9f7044a096e8 (patch) | |
| tree | e0a7d6259fde3ca836b5696e15c5dc543b8df698 /include | |
| parent | 17430858ee6bbf5e5f15a998ce5447f05d90b850 (diff) | |
| download | linux-3.10-f4b017da47d8aa1a1ab0fd4ec04b9f7044a096e8.tar.gz linux-3.10-f4b017da47d8aa1a1ab0fd4ec04b9f7044a096e8.tar.bz2 linux-3.10-f4b017da47d8aa1a1ab0fd4ec04b9f7044a096e8.zip | |
ALSA: compress: Fix 64bit ABI incompatibility
commit 6733cf572a9e20db2b7580a5dd39d5782d571eec upstream.
snd_pcm_uframes_t is defined as unsigned long so it would take
different sizes depending on 32 or 64bit architectures. As we don't
want this ABI incompatibility, and there is no real 64bit user yet,
let's make it the fixed size with __u32.
Also bump the protocol version number to 0.1.2.
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/sound/compress_offload.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/sound/compress_offload.h b/include/uapi/sound/compress_offload.h index d630163b9a2..5759810e1c1 100644 --- a/include/uapi/sound/compress_offload.h +++ b/include/uapi/sound/compress_offload.h @@ -30,7 +30,7 @@ #include <sound/compress_params.h> -#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 1) +#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 2) /** * struct snd_compressed_buffer: compressed buffer * @fragment_size: size of buffer fragment in bytes @@ -67,8 +67,8 @@ struct snd_compr_params { struct snd_compr_tstamp { __u32 byte_offset; __u32 copied_total; - snd_pcm_uframes_t pcm_frames; - snd_pcm_uframes_t pcm_io_frames; + __u32 pcm_frames; + __u32 pcm_io_frames; __u32 sampling_rate; }; |