summaryrefslogtreecommitdiff
path: root/drivers/leds
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-29 07:18:14 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 17:18:27 -0700
commitd041e861d49f1f558e9e18f2075345f8a37427dc (patch)
tree898f513dbdd37464006c319edb9e5e7cc7bf9f45 /drivers/leds
parent73e2c2b7c105e46344eb409575a4508f24a82eee (diff)
downloadlinux-3.10-d041e861d49f1f558e9e18f2075345f8a37427dc.tar.gz
linux-3.10-d041e861d49f1f558e9e18f2075345f8a37427dc.tar.bz2
linux-3.10-d041e861d49f1f558e9e18f2075345f8a37427dc.zip
leds: wm831x-status: Request a REG resource
commit 61abeba5222895d6900b13115f5d8eba7988d7d6 upstream. The wm831x-status driver was not converted to use a REG resource when they were introduced and the rest of the wm831x drivers converted, causing it to fail to probe due to requesting the wrong resource type. Signed-off-by: Mark Brown <broonie@linaro.org> Signed-off-by: Bryan Wu <cooloney@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/leds-wm831x-status.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/leds/leds-wm831x-status.c b/drivers/leds/leds-wm831x-status.c
index 6bd5c679d87..b7d83d6838f 100644
--- a/drivers/leds/leds-wm831x-status.c
+++ b/drivers/leds/leds-wm831x-status.c
@@ -230,9 +230,9 @@ static int wm831x_status_probe(struct platform_device *pdev)
int id = pdev->id % ARRAY_SIZE(chip_pdata->status);
int ret;
- res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+ res = platform_get_resource(pdev, IORESOURCE_REG, 0);
if (res == NULL) {
- dev_err(&pdev->dev, "No I/O resource\n");
+ dev_err(&pdev->dev, "No register resource\n");
ret = -EINVAL;
goto err;
}