diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-05 11:19:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-05 11:19:34 +0100 |
| commit | 4b5a5096bb834102b2e821f5f34274f041862d67 (patch) | |
| tree | fe55f4f11111e34d503a6a01aeb4bfc2eae5e88a /sound/usb | |
| parent | ALSA: usb-audio: Add a quirk for Plantronics Gamecom 780 (diff) | |
| parent | ALSA: hiface: Fix typo in 352800 rate definition (diff) | |
| download | linux-4b5a5096bb834102b2e821f5f34274f041862d67.tar.xz linux-4b5a5096bb834102b2e821f5f34274f041862d67.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/hiface/pcm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/hiface/pcm.c b/sound/usb/hiface/pcm.c index c21a3df9a0df..2c44139b4041 100644 --- a/sound/usb/hiface/pcm.c +++ b/sound/usb/hiface/pcm.c @@ -110,7 +110,7 @@ static const struct snd_pcm_hardware pcm_hw = { #define HIFACE_RATE_96000 0x4a #define HIFACE_RATE_176400 0x40 #define HIFACE_RATE_192000 0x48 -#define HIFACE_RATE_352000 0x58 +#define HIFACE_RATE_352800 0x58 #define HIFACE_RATE_384000 0x68 static int hiface_pcm_set_rate(struct pcm_runtime *rt, unsigned int rate) @@ -141,8 +141,8 @@ static int hiface_pcm_set_rate(struct pcm_runtime *rt, unsigned int rate) case 192000: rate_value = HIFACE_RATE_192000; break; - case 352000: - rate_value = HIFACE_RATE_352000; + case 352800: + rate_value = HIFACE_RATE_352800; break; case 384000: rate_value = HIFACE_RATE_384000; |