diff options
-rw-r--r-- | drivers/leds/leds-cobalt-raq.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/leds/leds-cobalt-raq.c b/drivers/leds/leds-cobalt-raq.c index aac1c073fe7b..7e41aa91bc56 100644 --- a/drivers/leds/leds-cobalt-raq.c +++ b/drivers/leds/leds-cobalt-raq.c | |||
@@ -85,13 +85,13 @@ static int __devinit cobalt_raq_led_probe(struct platform_device *pdev) | |||
85 | if (!res) | 85 | if (!res) |
86 | return -EBUSY; | 86 | return -EBUSY; |
87 | 87 | ||
88 | led_port = ioremap(res->start, resource_size(res)); | 88 | led_port = devm_ioremap(&pdev->dev, res->start, resource_size(res)); |
89 | if (!led_port) | 89 | if (!led_port) |
90 | return -ENOMEM; | 90 | return -ENOMEM; |
91 | 91 | ||
92 | retval = led_classdev_register(&pdev->dev, &raq_power_off_led); | 92 | retval = led_classdev_register(&pdev->dev, &raq_power_off_led); |
93 | if (retval) | 93 | if (retval) |
94 | goto err_iounmap; | 94 | goto err_null; |
95 | 95 | ||
96 | retval = led_classdev_register(&pdev->dev, &raq_web_led); | 96 | retval = led_classdev_register(&pdev->dev, &raq_web_led); |
97 | if (retval) | 97 | if (retval) |
@@ -102,8 +102,7 @@ static int __devinit cobalt_raq_led_probe(struct platform_device *pdev) | |||
102 | err_unregister: | 102 | err_unregister: |
103 | led_classdev_unregister(&raq_power_off_led); | 103 | led_classdev_unregister(&raq_power_off_led); |
104 | 104 | ||
105 | err_iounmap: | 105 | err_null: |
106 | iounmap(led_port); | ||
107 | led_port = NULL; | 106 | led_port = NULL; |
108 | 107 | ||
109 | return retval; | 108 | return retval; |
@@ -114,10 +113,8 @@ static int __devexit cobalt_raq_led_remove(struct platform_device *pdev) | |||
114 | led_classdev_unregister(&raq_power_off_led); | 113 | led_classdev_unregister(&raq_power_off_led); |
115 | led_classdev_unregister(&raq_web_led); | 114 | led_classdev_unregister(&raq_web_led); |
116 | 115 | ||
117 | if (led_port) { | 116 | if (led_port) |
118 | iounmap(led_port); | ||
119 | led_port = NULL; | 117 | led_port = NULL; |
120 | } | ||
121 | 118 | ||
122 | return 0; | 119 | return 0; |
123 | } | 120 | } |