From: Mark Brown Date: Fri, 25 Aug 2017 13:44:05 +0000 (+0100) Subject: Merge tag 'sound-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b7e2672d1a23a53bd2657704bf94a8dc8880cc49;p=linux.git Merge tag 'sound-4.13-rc7' of git://git./linux/kernel/git/tiwai/sound into asoc-rt5677 sound fixes for 4.13-rc7 We're keeping in a good shape, this batch contains just a few small fixes (a regression fix for ASoC rt5677 codec, NULL dereference and error-path fixes in firewire, and a corner-case ioctl error fix for user TLV), as well as usual quirks for USB-audio and HD-audio. --- b7e2672d1a23a53bd2657704bf94a8dc8880cc49 diff --cc sound/soc/codecs/rt5677.c index 9e9de0e274ea9,6f629278d982d..9875c8d05b5c4 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@@ -5010,6 -5019,9 +5010,8 @@@ static const struct regmap_config rt567 }; static const struct i2c_device_id rt5677_i2c_id[] = { + { "rt5677", RT5677 }, + { "rt5676", RT5676 }, - { "RT5677CE:00", RT5677 }, { } }; MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id);