Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Conflicts:
	arch/sparc/mm/init_64.c

Conflict was simple non-overlapping additions.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c
index 160e7510aca6..0787b9756165 100644
--- a/drivers/sbus/char/bbc_envctrl.c
+++ b/drivers/sbus/char/bbc_envctrl.c
@@ -452,6 +452,9 @@ static void attach_one_temp(struct bbc_i2c_bus *bp, struct platform_device *op,
         if (!tp)
                 return;
 
+        INIT_LIST_HEAD(&tp->bp_list);
+        INIT_LIST_HEAD(&tp->glob_list);
+
         tp->client = bbc_i2c_attach(bp, op);
         if (!tp->client) {
                 kfree(tp);
@@ -497,6 +500,9 @@ static void attach_one_fan(struct bbc_i2c_bus *bp, struct platform_device *op,
         if (!fp)
                 return;
 
+        INIT_LIST_HEAD(&fp->bp_list);
+        INIT_LIST_HEAD(&fp->glob_list);
+
         fp->client = bbc_i2c_attach(bp, op);
         if (!fp->client) {
                 kfree(fp);