Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: us122l: fix missing unlock in usb_stream_hwdep_vm_fault()
  ALSA: hda - Fix quirk lists for realtek codecs
  ALSA: hda - Add support of ALC272
  ALSA: hda - Add ALC887 support
  ALSA: hda - Add ALC1200 support
  ALSA: hda - Fix PCI SSID of ASUS M90V
  ALSA: hda - Add auto mic switch in realtek auto-probe mode
  ALSA: Fix pxa2xx-ac97-lib.c compilation
  ALSA: ASoC: Hide TLV320AIC26 configuration option for non-OpenFirwmare users
  ALSA: hda: fix nid variable warning
  ALSA: ASoC: Fix compile-time warning for tlv320aic23.c

1 files changed, 5 insertions, 5 deletions

diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index bac7815e00fb..44308dac9e18 100644
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -84,7 +84,7 @@ static int tlv320aic23_write(struct snd_soc_codec *codec, unsigned int reg,
                              unsigned int value)
 {
 
-        u8 data;
+        u8 data[2];
 
         /* TLV320AIC23 has 7 bit address and 9 bits of data
          * so we need to switch one data bit into reg and rest
@@ -96,12 +96,12 @@ static int tlv320aic23_write(struct snd_soc_codec *codec, unsigned int reg,
                 return -1;
         }
 
-        data = (reg << 1) | (value >> 8 & 0x01);
+        data[0] = (reg << 1) | (value >> 8 & 0x01);
+        data[1] = value & 0xff;
 
         tlv320aic23_write_reg_cache(codec, reg, value);
 
-        if (codec->hw_write(codec->control_data, data,
-                            (value & 0xff)) == 0)
+        if (codec->hw_write(codec->control_data, data, 2) == 2)
                 return 0;
 
         printk(KERN_ERR "%s cannot write %03x to register R%d\n", __func__,
@@ -674,7 +674,7 @@ static int tlv320aic23_probe(struct platform_device *pdev)
 
         tlv320aic23_socdev = socdev;
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-        codec->hw_write = (hw_write_t) i2c_smbus_write_byte_data;
+        codec->hw_write = (hw_write_t) i2c_master_send;
         codec->hw_read = NULL;
         ret = i2c_add_driver(&tlv320aic23_i2c_driver);
         if (ret != 0)