orinoco: do not resgister NULL pm_notifier function
PATCH 1/1 orinoco: do not resgister NULL pm_notifier function
With DEBUG_NOTIFIERS it results in
[11330.890966] WARNING: at /home/bor/src/linux-git/kernel/notifier.c:88 notifier_call_chain+0x91/0xa0() [11330.890977] Hardware name: PORTEGE 4000 [11330.890983] Invalid notifier called! ...
Without DEBUG_NOTIFIERS it most likely crashes on NULL pointer.
Signed-off-by Andrey Borzenkov <[email protected]>
---
This condition is triggered by default config options so it is 2.6.29 material. Patch is intentionally against 2.6.29 base and not against wireless-next.
drivers/net/wireless/orinoco/orinoco.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-)
drivers/net/wireless/orinoco/orinoco.c +15 -4
@@ -3158,8 +3158,20 @@ static int orinoco_pm_notifier(struct notifier_block *notifier, return NOTIFY_DONE; } + +static void orinoco_register_pm_notifier (struct orinoco_private *priv) +{ + priv->pm_notifier.notifier_call = orinoco_pm_notifier; +register_pm_notifier (&priv->pm_notifier); +} + +static void orinoco_unregister_pm_notifier (struct orinoco_private *priv) +{ +unregister_pm_notifier (&priv->pm_notifier); +}#else /* !PM_SLEEP || HERMES_CACHE_FW_ON_INIT */ -#define orinoco_pm_notifier NULL +#define orinoco_register_pm_notifier (priv) do { } while(0) +#define orinoco_unregister_pm_notifier (priv) do { } while(0)#endif /********************************************************************/
@@ -3653,8 +3665,7 @@ struct net_device priv->cached_fw =NULL ;/* Register PM notifiers */ - priv->pm_notifier.notifier_call = orinoco_pm_notifier; -register_pm_notifier (&priv->pm_notifier); +orinoco_register_pm_notifier (priv);return dev; }
@@ -3678,7 +3689,7 @@ void free_orinocodev(struct net_device *dev)kfree (rx_data); } -unregister_pm_notifier (&priv->pm_notifier); +orinoco_unregister_pm_notifier (priv);orinoco_uncache_fw (priv); priv->wpa_ie_len =0 ;
Quoted 10 lines · Andrey Borzenkov
With
DEBUG_NOTIFIERSit results in[11330.890966] WARNING: at /home/bor/src/linux-git/kernel/notifier.c:88 notifier_call_chain+0x91/0xa0() [11330.890977] Hardware name: PORTEGE 4000 [11330.890983] Invalid notifier called! ...Without
DEBUG_NOTIFIERSit most likely crashes on NULL pointer.Signed-off-by Andrey Borzenkov <[email protected]>
Acked-by David Kilroy <[email protected]>
Thanks for finding and fixing up the bugs I keep injecting :)