diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:29:40 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:29:40 -0400 |
| commit | 4456403f5ed589aeecc4271bc09f4ade6eae8adc (patch) | |
| tree | ce5f9d3416b1e47cdb0d40bd4226f6dcd121d20d /drivers/net/wireless/zd1211rw/zd_usb.c | |
| parent | 02b311bce9fc87987a123adc3e6a2d0a2caa70e2 (diff) | |
| parent | fde627b54ce7bef094157074f3adb9b6e1a96d4c (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_usb.c')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_usb.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c index c68b9f8995c..96551da769f 100644 --- a/drivers/net/wireless/zd1211rw/zd_usb.c +++ b/drivers/net/wireless/zd1211rw/zd_usb.c @@ -325,7 +325,6 @@ static void disable_read_regs_int(struct zd_usb *usb) { struct zd_usb_interrupt *intr = &usb->intr; - ZD_ASSERT(in_interrupt()); spin_lock(&intr->lock); intr->read_regs_enabled = 0; spin_unlock(&intr->lock); @@ -547,11 +546,11 @@ static void handle_rx_packet(struct zd_usb *usb, const u8 *buffer, * be padded. Unaligned access might also happen if the length_info * structure is not present. */ - if (get_unaligned(&length_info->tag) == RX_LENGTH_INFO_TAG) { + if (get_unaligned(&length_info->tag) == cpu_to_le16(RX_LENGTH_INFO_TAG)) + { unsigned int l, k, n; for (i = 0, l = 0;; i++) { - k = le16_to_cpu(get_unaligned( - &length_info->length[i])); + k = le16_to_cpu(get_unaligned(&length_info->length[i])); n = l+k; if (n > length) return; |