summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2012-02-28 10:30:59 -0800
committerDmitry Shmidt <dimitrysh@google.com>2012-02-29 10:46:08 -0800
commit46ec987de3c3009cebc6e0735c4f865b71ae833b (patch)
tree72256e42fb35b2cf794eb0293448f0132704ee1d /drivers/net
parentee88a6c5e260219cd2b2c540fdaf714ad7d74ec8 (diff)
net: wireless: bcmdhd: Minor cleaning
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/bcmdhd/dhd_linux.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c
index 2285078c7ec8..6418e38f3b73 100644
--- a/drivers/net/wireless/bcmdhd/dhd_linux.c
+++ b/drivers/net/wireless/bcmdhd/dhd_linux.c
@@ -3748,7 +3748,7 @@ dhd_module_init(void)
error = -ENODEV;
DHD_ERROR(("%s: sdio_register_driver timeout\n", __FUNCTION__));
goto fail_2;
- }
+ }
#endif
#if defined(WL_CFG80211)
wl_android_post_init();
@@ -4377,8 +4377,6 @@ dhd_dev_get_pno_status(struct net_device *dev)
#endif /* PNO_SUPPORT */
-struct work_struct work;
-
int net_os_send_hang_message(struct net_device *dev)
{
dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
@@ -4411,7 +4409,7 @@ void dhd_bus_country_set(struct net_device *dev, wl_country_t *cspec)
dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);
if (dhd && dhd->pub.up)
- memcpy(&dhd->pub.dhd_cspec, cspec, sizeof(wl_country_t));
+ memcpy(&dhd->pub.dhd_cspec, cspec, sizeof(wl_country_t));
}
void dhd_net_if_lock(struct net_device *dev)