On Wed, May 30, 2012 at 4:45 PM, Johannes Berg
<johannes@xxxxxxxxxxxxxxxx> wrote:
> From: Johannes Berg <johannes.berg@xxxxxxxxx>
>
> When CONFIG_PM is enabled, no device can possibly
> support WoWLAN since it can't go to sleep to start
> with. Due to this, mac80211 had even rejected the
> hardware registration. By making all the code and
> data for WoWLAN depend on CONFIG_PM we can promote
> this runtime error to a compile-time error.
>
> Add #ifdef around all WoWLAN code to remove it in
> systems that don't need it as they never suspend.
>
> Cc: Kalle Valo <kvalo@xxxxxxxxxxxxxxxx>
> Cc: Luciano Coelho <coelho@xxxxxx>
> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
> ---
[...]
> diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
> index acef933..d7cd9b5 100644
> --- a/drivers/net/wireless/ti/wlcore/main.c
> +++ b/drivers/net/wireless/ti/wlcore/main.c
> @@ -5301,6 +5301,7 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
> goto out_free_hw;
> }
>
> +#ifdef CONFIG_PM
> ret = enable_irq_wake(wl->irq);
> if (!ret) {
> wl->irq_wake_enabled = true;
> @@ -5315,6 +5316,7 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
> }
> }
> disable_irq(wl->irq);
> +#endif
i think disable_irq should be outside the ifdef.
Eliad.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
