diff options
Diffstat (limited to 'sound/aoa/codecs/snd-aoa-codec-tas.c')
-rw-r--r-- | sound/aoa/codecs/snd-aoa-codec-tas.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c index 2cd81fa07ce1..ceca38486eae 100644 --- a/sound/aoa/codecs/snd-aoa-codec-tas.c +++ b/sound/aoa/codecs/snd-aoa-codec-tas.c | |||
@@ -939,9 +939,9 @@ static int tas_i2c_attach(struct i2c_adapter *adapter) | |||
939 | 939 | ||
940 | while ((dev = of_get_next_child(busnode, dev)) != NULL) { | 940 | while ((dev = of_get_next_child(busnode, dev)) != NULL) { |
941 | if (device_is_compatible(dev, "tas3004")) { | 941 | if (device_is_compatible(dev, "tas3004")) { |
942 | u32 *addr; | 942 | const u32 *addr; |
943 | printk(KERN_DEBUG PFX "found tas3004\n"); | 943 | printk(KERN_DEBUG PFX "found tas3004\n"); |
944 | addr = (u32 *) get_property(dev, "reg", NULL); | 944 | addr = of_get_property(dev, "reg", NULL); |
945 | if (!addr) | 945 | if (!addr) |
946 | continue; | 946 | continue; |
947 | return tas_create(adapter, dev, ((*addr) >> 1) & 0x7f); | 947 | return tas_create(adapter, dev, ((*addr) >> 1) & 0x7f); |
@@ -950,9 +950,10 @@ static int tas_i2c_attach(struct i2c_adapter *adapter) | |||
950 | * property that says 'tas3004', they just have a 'deq' | 950 | * property that says 'tas3004', they just have a 'deq' |
951 | * node without any such property... */ | 951 | * node without any such property... */ |
952 | if (strcmp(dev->name, "deq") == 0) { | 952 | if (strcmp(dev->name, "deq") == 0) { |
953 | u32 *_addr, addr; | 953 | const u32 *_addr; |
954 | u32 addr; | ||
954 | printk(KERN_DEBUG PFX "found 'deq' node\n"); | 955 | printk(KERN_DEBUG PFX "found 'deq' node\n"); |
955 | _addr = (u32 *) get_property(dev, "i2c-address", NULL); | 956 | _addr = of_get_property(dev, "i2c-address", NULL); |
956 | if (!_addr) | 957 | if (!_addr) |
957 | continue; | 958 | continue; |
958 | addr = ((*_addr) >> 1) & 0x7f; | 959 | addr = ((*_addr) >> 1) & 0x7f; |