← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to sound/core/pcm.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/core/pcm.c
211
211
 
212
212
const char *snd_pcm_format_name(snd_pcm_format_t format)
213
213
{
214
 
        if (format >= ARRAY_SIZE(snd_pcm_format_names))
 
214
        if ((__force unsigned int)format >= ARRAY_SIZE(snd_pcm_format_names))
215
215
                return "Unknown";
216
 
        return snd_pcm_format_names[format];
 
216
        return snd_pcm_format_names[(__force unsigned int)format];
217
217
}
218
218
EXPORT_SYMBOL_GPL(snd_pcm_format_name);
219
219
 
269
269
 
270
270
static const char *snd_pcm_access_name(snd_pcm_access_t access)
271
271
{
272
 
        return snd_pcm_access_names[access];
 
272
        return snd_pcm_access_names[(__force int)access];
273
273
}
274
274
 
275
275
static const char *snd_pcm_subformat_name(snd_pcm_subformat_t subformat)
276
276
{
277
 
        return snd_pcm_subformat_names[subformat];
 
277
        return snd_pcm_subformat_names[(__force int)subformat];
278
278
}
279
279
 
280
280
static const char *snd_pcm_tstamp_mode_name(int mode)
284
284
 
285
285
static const char *snd_pcm_state_name(snd_pcm_state_t state)
286
286
{
287
 
        return snd_pcm_state_names[state];
 
287
        return snd_pcm_state_names[(__force int)state];
288
288
}
289
289
 
290
290
#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)