aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sbus/char
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-30 01:55:14 -0400
committerDavid S. Miller <davem@davemloft.net>2008-08-30 01:55:14 -0400
commit39890072b320e7731b105b459cee1320957adbc7 (patch)
tree1b749bdde14e63c2516d13590fcc9e677018f649 /drivers/sbus/char
parentae05f87ee2f403228bca6d28fef29d6be0bfbedc (diff)
bbc_envctrl: Fix build errors from bbc_i2c OF conversion.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/sbus/char')
-rw-r--r--drivers/sbus/char/bbc_envctrl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c
index abe4d50de21d..15dab96d05e3 100644
--- a/drivers/sbus/char/bbc_envctrl.c
+++ b/drivers/sbus/char/bbc_envctrl.c
@@ -451,7 +451,7 @@ static void attach_one_temp(struct bbc_i2c_bus *bp, struct of_device *op,
451 if (!tp) 451 if (!tp)
452 return; 452 return;
453 453
454 tp->client = bbc_i2c_attach(op); 454 tp->client = bbc_i2c_attach(bp, op);
455 if (!tp->client) { 455 if (!tp->client) {
456 kfree(tp); 456 kfree(tp);
457 return; 457 return;
@@ -496,7 +496,7 @@ static void attach_one_fan(struct bbc_i2c_bus *bp, struct of_device *op,
496 if (!fp) 496 if (!fp)
497 return; 497 return;
498 498
499 fp->client = bbc_i2c_attach(op); 499 fp->client = bbc_i2c_attach(bp, op);
500 if (!fp->client) { 500 if (!fp->client) {
501 kfree(fp); 501 kfree(fp);
502 return; 502 return;
@@ -529,7 +529,7 @@ int bbc_envctrl_init(struct bbc_i2c_bus *bp)
529 int fan_index = 0; 529 int fan_index = 0;
530 int devidx = 0; 530 int devidx = 0;
531 531
532 while ((op = bbc_i2c_getdev(devidx++)) != NULL) { 532 while ((op = bbc_i2c_getdev(bp, devidx++)) != NULL) {
533 if (!strcmp(op->node->name, "temperature")) 533 if (!strcmp(op->node->name, "temperature"))
534 attach_one_temp(bp, op, temp_index++); 534 attach_one_temp(bp, op, temp_index++);
535 if (!strcmp(op->node->name, "fan-control")) 535 if (!strcmp(op->node->name, "fan-control"))