diff options
Diffstat (limited to 'drivers/net/phy/phy_led_triggers.c')
-rw-r--r-- | drivers/net/phy/phy_led_triggers.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/phy/phy_led_triggers.c b/drivers/net/phy/phy_led_triggers.c index fa62bdf2f526..94ca42e630bb 100644 --- a/drivers/net/phy/phy_led_triggers.c +++ b/drivers/net/phy/phy_led_triggers.c | |||
@@ -12,6 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | #include <linux/leds.h> | 13 | #include <linux/leds.h> |
14 | #include <linux/phy.h> | 14 | #include <linux/phy.h> |
15 | #include <linux/phy_led_triggers.h> | ||
15 | #include <linux/netdevice.h> | 16 | #include <linux/netdevice.h> |
16 | 17 | ||
17 | static struct phy_led_trigger *phy_speed_to_led_trigger(struct phy_device *phy, | 18 | static struct phy_led_trigger *phy_speed_to_led_trigger(struct phy_device *phy, |
@@ -102,8 +103,10 @@ int phy_led_triggers_register(struct phy_device *phy) | |||
102 | sizeof(struct phy_led_trigger) * | 103 | sizeof(struct phy_led_trigger) * |
103 | phy->phy_num_led_triggers, | 104 | phy->phy_num_led_triggers, |
104 | GFP_KERNEL); | 105 | GFP_KERNEL); |
105 | if (!phy->phy_led_triggers) | 106 | if (!phy->phy_led_triggers) { |
106 | return -ENOMEM; | 107 | err = -ENOMEM; |
108 | goto out_clear; | ||
109 | } | ||
107 | 110 | ||
108 | for (i = 0; i < phy->phy_num_led_triggers; i++) { | 111 | for (i = 0; i < phy->phy_num_led_triggers; i++) { |
109 | err = phy_led_trigger_register(phy, &phy->phy_led_triggers[i], | 112 | err = phy_led_trigger_register(phy, &phy->phy_led_triggers[i], |
@@ -120,6 +123,8 @@ out_unreg: | |||
120 | while (i--) | 123 | while (i--) |
121 | phy_led_trigger_unregister(&phy->phy_led_triggers[i]); | 124 | phy_led_trigger_unregister(&phy->phy_led_triggers[i]); |
122 | devm_kfree(&phy->mdio.dev, phy->phy_led_triggers); | 125 | devm_kfree(&phy->mdio.dev, phy->phy_led_triggers); |
126 | out_clear: | ||
127 | phy->phy_num_led_triggers = 0; | ||
123 | return err; | 128 | return err; |
124 | } | 129 | } |
125 | EXPORT_SYMBOL_GPL(phy_led_triggers_register); | 130 | EXPORT_SYMBOL_GPL(phy_led_triggers_register); |