Merge branch 'master'

2 files changed, 6 insertions, 3 deletions

diff --git a/drivers/net/wan/sdladrv.c b/drivers/net/wan/sdladrv.c
index 7c2cf2e76300..032c0f81928e 100644
--- a/drivers/net/wan/sdladrv.c
+++ b/drivers/net/wan/sdladrv.c
@@ -1994,7 +1994,7 @@ static int detect_s514 (sdlahw_t* hw)
                 modname, hw->irq);
 
         /* map the physical PCI memory to virtual memory */
-        (void *)hw->dpmbase = ioremap((unsigned long)S514_mem_base_addr,
+        hw->dpmbase = ioremap((unsigned long)S514_mem_base_addr,
                 (unsigned long)MAX_SIZEOF_S514_MEMORY);
         /* map the physical control register memory to virtual memory */
         hw->vector = (unsigned long)ioremap(
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index b0d195d1721a..5e7c7e944c9d 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -1110,8 +1110,7 @@ static struct ipw_fw_error *ipw_alloc_error_log(struct ipw_priv *priv)
         error->elem_len = elem_len;
         error->log_len = log_len;
         error->elem = (struct ipw_error_elem *)error->payload;
-        error->log = (struct ipw_event *)(error->elem +
-                                          (sizeof(*error->elem) * elem_len));
+        error->log = (struct ipw_event *)(error->elem + elem_len);
 
         ipw_capture_event_log(priv, log_len, error->log);
 
@@ -8926,6 +8925,10 @@ static int ipw_request_direct_scan(struct ipw_priv *priv, char *essid,
         struct ipw_scan_request_ext scan;
         int err = 0, scan_type;
 
+        if (!(priv->status & STATUS_INIT) ||
+            (priv->status & STATUS_EXIT_PENDING))
+                return 0;
+
         down(&priv->sem);
 
         if (priv->status & STATUS_RF_KILL_MASK) {