From: Paul Mackerras <paulus@samba.org>
Date: Tue, 1 Aug 2006 00:37:25 +0000 (+1000)
Subject: Merge branch 'merge'
X-Git-Tag: v2.6.19-rc1~1300^2~69
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57cad8084e0837e0f2c97da789ec9b3f36809be9;p=linux-2.6

Merge branch 'merge'
---

57cad8084e0837e0f2c97da789ec9b3f36809be9
diff --cc drivers/macintosh/smu.c
index 6f35860053,00ef468981..090e40fc50
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@@ -483,9 -490,10 +490,10 @@@ int __init smu_init (void
  		printk(KERN_ERR "SMU: Can't find doorbell GPIO !\n");
  		goto fail;
  	}
- 	data = get_property(np, "reg", NULL);
 -	data = (u32 *)get_property(smu->db_node, "reg", NULL);
++	data = get_property(smu->db_node, "reg", NULL);
  	if (data == NULL) {
- 		of_node_put(np);
+ 		of_node_put(smu->db_node);
+ 		smu->db_node = NULL;
  		printk(KERN_ERR "SMU: Can't find doorbell GPIO address !\n");
  		goto fail;
  	}
@@@ -500,15 -508,13 +508,13 @@@
  
  	/* Now look for the smu-interrupt GPIO */
  	do {
- 		np = of_find_node_by_name(NULL, "smu-interrupt");
- 		if (np == NULL)
+ 		smu->msg_node = of_find_node_by_name(NULL, "smu-interrupt");
+ 		if (smu->msg_node == NULL)
  			break;
- 		data = get_property(np, "reg", NULL);
 -		data = (u32 *)get_property(smu->msg_node, "reg", NULL);
++		data = get_property(smu->msg_node, "reg", NULL);
  		if (data == NULL) {
- 			of_node_put(np);
+ 			of_node_put(smu->msg_node);
+ 			smu->msg_node = NULL;
  			break;
  		}
  		smu->msg = *data;