diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-01-19 13:08:25 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-01-19 13:08:25 (GMT) |
commit | 6e78b780efdfc5cfbd3c92df7dbdfb5c81aa2a15 (patch) | |
tree | a89246f0656e1aed6930abe35dc4682511606a72 /sound/pci/oxygen/virtuoso.c | |
parent | c0554f102e428b8d8de3bd006a7aa77d9a3ff930 (diff) | |
parent | 3288a66243c8d34c299dd6b8a336a34321ccff52 (diff) | |
download | linux-fsl-qoriq-6e78b780efdfc5cfbd3c92df7dbdfb5c81aa2a15.tar.xz |
Merge branch 'topic/virtuoso' into for-linus
Diffstat (limited to 'sound/pci/oxygen/virtuoso.c')
-rw-r--r-- | sound/pci/oxygen/virtuoso.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index e9e829e..18c7c91 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c @@ -683,7 +683,7 @@ static void xonar_hdav_uart_input(struct oxygen *chip) if (chip->uart_input_count >= 2 && chip->uart_input[chip->uart_input_count - 2] == 'O' && chip->uart_input[chip->uart_input_count - 1] == 'K') { - printk(KERN_DEBUG "message from Xonar HDAV HDMI chip received:"); + printk(KERN_DEBUG "message from Xonar HDAV HDMI chip received:\n"); print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, chip->uart_input, chip->uart_input_count); chip->uart_input_count = 0; @@ -908,6 +908,7 @@ static const struct oxygen_model model_xonar_hdav = { .dac_channels = 8, .dac_volume_min = 0x0f, .dac_volume_max = 0xff, + .misc_flags = OXYGEN_MISC_MIDI, .function_flags = OXYGEN_FUNCTION_2WIRE, .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |