summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-05-08 13:28:37 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-05-09 10:58:21 +1000
commit9525a08b30b1c8e39578938fc3420ac0b56f3a3d (patch)
tree7ec620d4cbfa7817e53f982ead1d615cf3c6c1b3 /drivers/macintosh
parentea4e89afedc7fc64078076eacbcffaaa742baf0d (diff)
downloadlinux-9525a08b30b1c8e39578938fc3420ac0b56f3a3d.tar.gz
linux-9525a08b30b1c8e39578938fc3420ac0b56f3a3d.tar.bz2
linux-9525a08b30b1c8e39578938fc3420ac0b56f3a3d.zip
powerpc/windfarm: Fix crash on SMU based machine after i2c conversion
We no longer get the device node in platform_data but instead where it belongs in struct device, so get it from there instead of blowing up. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r--drivers/macintosh/windfarm_smu_sat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index e2989cef2309..426e810233d7 100644
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -204,7 +204,7 @@ static struct wf_sensor_ops wf_sat_ops = {
static int wf_sat_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
- struct device_node *dev = client->dev.platform_data;
+ struct device_node *dev = client->dev.of_node;
struct wf_sat *sat;
struct wf_sat_sensor *sens;
const u32 *reg;