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

[linux-2.6-omap-h63xx.git] / sound / aoa / codecs / snd-aoa-codec-tas.c

diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c
index 2cd81fa07ce100b2e12b3ba89425457845270b42..ceca38486eae7d4a54797f981ff383e150e6a27b 100644 (file)
--- 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)
 
        while ((dev = of_get_next_child(busnode, dev)) != NULL) {
                if (device_is_compatible(dev, "tas3004")) {
-                       u32 *addr;
+                       const u32 *addr;
                        printk(KERN_DEBUG PFX "found tas3004\n");
-                       addr = (u32 *) get_property(dev, "reg", NULL);
+                       addr = of_get_property(dev, "reg", NULL);
                        if (!addr)
                                continue;
                        return tas_create(adapter, dev, ((*addr) >> 1) & 0x7f);
@@ -950,9 +950,10 @@ static int tas_i2c_attach(struct i2c_adapter *adapter)
                 * property that says 'tas3004', they just have a 'deq'
                 * node without any such property... */
                if (strcmp(dev->name, "deq") == 0) {
-                       u32 *_addr, addr;
+                       const u32 *_addr;
+                       u32 addr;
                        printk(KERN_DEBUG PFX "found 'deq' node\n");
-                       _addr = (u32 *) get_property(dev, "i2c-address", NULL);
+                       _addr = of_get_property(dev, "i2c-address", NULL);
                        if (!_addr)
                                continue;
                        addr = ((*_addr) >> 1) & 0x7f;