Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 6 insertions, 7 deletions

diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index b3efc9aa2916..da54d04a3e3a 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2284,15 +2284,14 @@ static int __init cs4231_init(void)
                 for_each_ebusdev(edev, ebus) {
                         int match = 0;
 
-                        if (!strcmp(edev->prom_name, "SUNW,CS4231")) {
+                        if (!strcmp(edev->prom_node->name, "SUNW,CS4231")) {
                                 match = 1;
-                        } else if (!strcmp(edev->prom_name, "audio")) {
-                                char compat[16];
+                        } else if (!strcmp(edev->prom_node->name, "audio")) {
+                                char *compat;
 
-                                prom_getstring(edev->prom_node, "compatible",
-                                               compat, sizeof(compat));
-                                compat[15] = '\0';
-                                if (!strcmp(compat, "SUNW,CS4231"))
+                                compat = of_get_property(edev->prom_node,
+                                                         "compatible", NULL);
+                                if (compat && !strcmp(compat, "SUNW,CS4231"))
                                         match = 1;
                         }