xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/wireless/orinoco/orinoco.c
This commit is contained in:
David S. Miller
2009-02-25 00:02:05 -08:00
parent 4545a3f276 0c9a3aaaf3
commit f11c179eea
11 changed files with 209 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/wireless/orinoco/main.c
View File

@@ -2076,8 +2076,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
/********************************************************************/
@@ -2572,8 +2584,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;
}
@@ -2598,7 +2609,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;