|
@@ -93,7 +93,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p,
|
|
|
struct snd_sb_csp_microcode __user * code);
|
|
|
static int snd_sb_csp_unload(struct snd_sb_csp * p);
|
|
|
static int snd_sb_csp_load_user(struct snd_sb_csp * p, const unsigned char __user *buf, int size, int load_flags);
|
|
|
-static int snd_sb_csp_autoload(struct snd_sb_csp * p, int pcm_sfmt, int play_rec_mode);
|
|
|
+static int snd_sb_csp_autoload(struct snd_sb_csp * p, snd_pcm_format_t pcm_sfmt, int play_rec_mode);
|
|
|
static int snd_sb_csp_check_version(struct snd_sb_csp * p);
|
|
|
|
|
|
static int snd_sb_csp_use(struct snd_sb_csp * p);
|
|
@@ -726,7 +726,7 @@ static int snd_sb_csp_firmware_load(struct snd_sb_csp *p, int index, int flags)
|
|
|
* autoload hardware codec if necessary
|
|
|
* return 0 if CSP is loaded and ready to run (p->running != 0)
|
|
|
*/
|
|
|
-static int snd_sb_csp_autoload(struct snd_sb_csp * p, int pcm_sfmt, int play_rec_mode)
|
|
|
+static int snd_sb_csp_autoload(struct snd_sb_csp * p, snd_pcm_format_t pcm_sfmt, int play_rec_mode)
|
|
|
{
|
|
|
unsigned long flags;
|
|
|
int err = 0;
|
|
@@ -736,7 +736,7 @@ static int snd_sb_csp_autoload(struct snd_sb_csp * p, int pcm_sfmt, int play_rec
|
|
|
return -EBUSY;
|
|
|
|
|
|
/* autoload microcode only if requested hardware codec is not already loaded */
|
|
|
- if (((1 << pcm_sfmt) & p->acc_format) && (play_rec_mode & p->mode)) {
|
|
|
+ if (((1U << (__force int)pcm_sfmt) & p->acc_format) && (play_rec_mode & p->mode)) {
|
|
|
p->running = SNDRV_SB_CSP_ST_AUTO;
|
|
|
} else {
|
|
|
switch (pcm_sfmt) {
|