Fix for suspend/resume bug

drivers/staging/brcm80211/brcmfmac/dhd.h

 /*
  * Copyright (c) 2010 Broadcom Corporation
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
@@ skipping 19 matching lines @@
 #include <linux/etherdevice.h>
 #include <linux/random.h>
 #include <linux/spinlock.h>
 #include <linux/ethtool.h>
 #include <asm/uaccess.h>
 #include <asm/unaligned.h>
 /* The kernel threading is sdio-specific */
 
 #include <wlioctl.h>
 
+#if defined(CONFIG_PM_SLEEP)
+#include <linux/suspend.h>
+#endif

[Olof Johansson, 2011/04/14 18:13:43]

No need to ifdef the include.

+
 /* Forward decls */
 struct dhd_bus;
 struct dhd_prot;
 struct dhd_info;
 
 /* The level of bus communication with the dongle */
 enum dhd_bus_state {
         DHD_BUS_DOWN,           /* Not ready for frame transfers */
         DHD_BUS_LOAD,           /* Download access only (CPU reset) */
         DHD_BUS_DATA            /* Ready for frame transfers */
@@ skipping 67 matching lines @@
         char *pktfilter[100];
         int pktfilter_count;
 
         u8 country_code[WLC_CNTRY_BUF_SZ];
         char eventmask[WL_EVENTING_MASK_LEN];
 
 } dhd_pub_t;
 
 #if defined(CONFIG_PM_SLEEP)
 
+extern volatile bool dhd_mmc_suspend;

[Olof Johansson, 2011/04/14 18:13:43]

Extern volatile? Huge red flags. Please move to an appropriate header file, and
why is it volatile?

+
 #define DHD_PM_RESUME_WAIT_INIT(a) DECLARE_WAIT_QUEUE_HEAD(a);
 #define _DHD_PM_RESUME_WAIT(a, b) do {\
                         int retry = 0; \
                         while (dhd_mmc_suspend && retry++ != b) { \
                                 wait_event_timeout(a, false, HZ/100); \
                         } \
                 }       while (0)
 #define DHD_PM_RESUME_WAIT(a)   _DHD_PM_RESUME_WAIT(a, 30)
 #define DHD_PM_RESUME_WAIT_FOREVER(a)   _DHD_PM_RESUME_WAIT(a, ~0)
 #define DHD_PM_RESUME_RETURN_ERROR(a)   \
@@ skipping 259 matching lines @@
 
 /* For supporting multiple interfaces */
 #define DHD_MAX_IFS     16
 #define DHD_DEL_IF      -0xe
 #define DHD_BAD_IF      -0xf
 
 extern void dhd_wait_for_event(dhd_pub_t *dhd, bool * lockvar);
 extern void dhd_wait_event_wakeup(dhd_pub_t *dhd);
 
 #endif                          /* _dhd_h_ */