Merge branch 'master' into for-next

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index 3f283bff0ff7..11491354e5b5 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -1192,7 +1192,7 @@ int i2400m_fw_hdr_check(struct i2400m *i2400m,
         unsigned module_type, header_len, major_version, minor_version,
                 module_id, module_vendor, date, size;
 
-        module_type = bcf_hdr->module_type;
+        module_type = le32_to_cpu(bcf_hdr->module_type);
         header_len = sizeof(u32) * le32_to_cpu(bcf_hdr->header_len);
         major_version = (le32_to_cpu(bcf_hdr->header_version) & 0xffff0000)
                 >> 16;
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
index 6537593fae66..8cc9e319f435 100644
--- a/drivers/net/wimax/i2400m/rx.c
+++ b/drivers/net/wimax/i2400m/rx.c
@@ -1027,12 +1027,12 @@ void i2400m_rx_edata(struct i2400m *i2400m, struct sk_buff *skb_rx,
                 ro_sn = (reorder >> I2400M_RO_SN_SHIFT) & I2400M_RO_SN;
 
                 spin_lock_irqsave(&i2400m->rx_lock, flags);
-                roq = &i2400m->rx_roq[ro_cin];
-                if (roq == NULL) {
+                if (i2400m->rx_roq == NULL) {
                         kfree_skb(skb); /* rx_roq is already destroyed */
                         spin_unlock_irqrestore(&i2400m->rx_lock, flags);
                         goto error;
                 }
+                roq = &i2400m->rx_roq[ro_cin];
                 kref_get(&i2400m->rx_roq_refcount);
                 spin_unlock_irqrestore(&i2400m->rx_lock, flags);