From 15afc5ae66951079e95df30dd7f4149f6f55f45d Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Tue, 23 Oct 2012 05:21:27 -0700 Subject: [PATCH] --- yaml --- r: 344459 b: refs/heads/master c: f87ef101056a34d69d7aa2611da0eb95ff4414f9 h: refs/heads/master i: 344457: 0ec58a8d9fc0119efd7d363c5d5d5e718a47c914 344455: b68023564e4a0074e3724df4c76913deb1dec371 v: v3 --- [refs] | 2 +- trunk/drivers/leds/leds-cobalt-qube.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 789c8014cc20..3ae450470330 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50e5194385a7be0f3c6b1f97749854cf29562619 +refs/heads/master: f87ef101056a34d69d7aa2611da0eb95ff4414f9 diff --git a/trunk/drivers/leds/leds-cobalt-qube.c b/trunk/drivers/leds/leds-cobalt-qube.c index 6a8725cc7b4d..86d6db74efd8 100644 --- a/trunk/drivers/leds/leds-cobalt-qube.c +++ b/trunk/drivers/leds/leds-cobalt-qube.c @@ -43,7 +43,7 @@ static int __devinit cobalt_qube_led_probe(struct platform_device *pdev) if (!res) return -EBUSY; - led_port = ioremap(res->start, resource_size(res)); + led_port = devm_ioremap(&pdev->dev, res->start, resource_size(res)); if (!led_port) return -ENOMEM; @@ -52,12 +52,11 @@ static int __devinit cobalt_qube_led_probe(struct platform_device *pdev) retval = led_classdev_register(&pdev->dev, &qube_front_led); if (retval) - goto err_iounmap; + goto err_null; return 0; -err_iounmap: - iounmap(led_port); +err_null: led_port = NULL; return retval; @@ -67,10 +66,8 @@ static int __devexit cobalt_qube_led_remove(struct platform_device *pdev) { led_classdev_unregister(&qube_front_led); - if (led_port) { - iounmap(led_port); + if (led_port) led_port = NULL; - } return 0; }