From 1e18def66e20e81be39b6535a23a21be9a669e9d Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 2 Feb 2012 13:45:09 +0000 Subject: [PATCH] --- yaml --- r: 292023 b: refs/heads/master c: 34ce8d07e63baa37d21aeca87f3248b008114899 h: refs/heads/master i: 292021: 57029eca4d1497faf1d83418d8afc1c060b3caa6 292019: f1437beb18a212b13d6cd20befc024e3e56e4201 292015: 11d5323c11a7ecf4bcd9e05181fbcf8ca7c0df83 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/wm8350-regulator.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 69bb40f2dbae..205916e39eb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e0c66f49762fa1866ab20b1feb6e86a9aa4838f +refs/heads/master: 34ce8d07e63baa37d21aeca87f3248b008114899 diff --git a/trunk/drivers/regulator/wm8350-regulator.c b/trunk/drivers/regulator/wm8350-regulator.c index 6894009d815a..4f46067455c8 100644 --- a/trunk/drivers/regulator/wm8350-regulator.c +++ b/trunk/drivers/regulator/wm8350-regulator.c @@ -1544,7 +1544,7 @@ int wm8350_register_led(struct wm8350 *wm8350, int lednum, int dcdc, int isink, return -ENOMEM; } - led->isink_consumer.dev = &pdev->dev; + led->isink_consumer.dev_name = dev_name(&pdev->dev); led->isink_consumer.supply = "led_isink"; led->isink_init.num_consumer_supplies = 1; led->isink_init.consumer_supplies = &led->isink_consumer; @@ -1559,7 +1559,7 @@ int wm8350_register_led(struct wm8350 *wm8350, int lednum, int dcdc, int isink, return ret; } - led->dcdc_consumer.dev = &pdev->dev; + led->dcdc_consumer.dev_name = dev_name(&pdev->dev); led->dcdc_consumer.supply = "led_vcc"; led->dcdc_init.num_consumer_supplies = 1; led->dcdc_init.consumer_supplies = &led->dcdc_consumer;