diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-02-08 15:04:18 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 20:33:36 -0800 |
| commit | 367636e8a9ef250d5b255f9d299e1c27cb3d7ea3 (patch) | |
| tree | 19a8a96154d2a318a2dbd02d5dfab8530e0b8606 /sound/oss/dmasound/tas_common.h | |
| parent | fe69102188cde0700cddd8d4cda0b77d68284884 (diff) | |
| download | op-kernel-dev-367636e8a9ef250d5b255f9d299e1c27cb3d7ea3.zip op-kernel-dev-367636e8a9ef250d5b255f9d299e1c27cb3d7ea3.tar.gz | |
[PATCH] powerpc: Fix sound driver use of i2c
The PowerMac sound drivers used to rely on a "bug" of the i2c-keywest
driver that implemented I2C_SMBUS_BLOCK_DATA incorrectly, that is it did
what I2C_SMBUS_I2C_BLOCK_DATA should have done. The new i2c-powermac
driver that replaces keywest has this bug fixed, thus the sound drivers
must be fixed too.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss/dmasound/tas_common.h')
| -rw-r--r-- | sound/oss/dmasound/tas_common.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/oss/dmasound/tas_common.h b/sound/oss/dmasound/tas_common.h index 3a6d486..0741c28 100644 --- a/sound/oss/dmasound/tas_common.h +++ b/sound/oss/dmasound/tas_common.h @@ -178,10 +178,10 @@ tas_write_register( struct tas_data_t *self, if (write_mode & WRITE_SHADOW) memcpy(self->shadow[reg_num],data,reg_width); if (write_mode & WRITE_HW) { - rc=i2c_smbus_write_block_data(self->client, - reg_num, - reg_width, - data); + rc=i2c_smbus_write_i2c_block_data(self->client, + reg_num, + reg_width, + data); if (rc < 0) { printk("tas: I2C block write failed \n"); return rc; @@ -199,10 +199,10 @@ tas_sync_register( struct tas_data_t *self, if (reg_width==0 || self==NULL) return -EINVAL; - rc=i2c_smbus_write_block_data(self->client, - reg_num, - reg_width, - self->shadow[reg_num]); + rc=i2c_smbus_write_i2c_block_data(self->client, + reg_num, + reg_width, + self->shadow[reg_num]); if (rc < 0) { printk("tas: I2C block write failed \n"); return rc; |
