summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-05 11:19:34 +0100
committerTakashi Iwai <tiwai@suse.de>2014-01-05 11:19:34 +0100
commit4b5a5096bb834102b2e821f5f34274f041862d67 (patch)
treefe55f4f11111e34d503a6a01aeb4bfc2eae5e88a /sound/usb
parent19570d747795f0ecff79403698b868dc5ad7fa86 (diff)
parent150116bcfbd9004f01e682535baddaca2b90d3b2 (diff)
downloadop-kernel-dev-4b5a5096bb834102b2e821f5f34274f041862d67.zip
op-kernel-dev-4b5a5096bb834102b2e821f5f34274f041862d67.tar.gz
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/hiface/pcm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/hiface/pcm.c b/sound/usb/hiface/pcm.c
index c21a3df..2c44139 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;
OpenPOWER on IntegriCloud