Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / irda / mcs7780.c

diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 0b769192d4ce0753c872410c601a1e2eb4849a8e..ad92d3ff1c4093ff6ea8281c430374ab26ff3ac2 100644 (file)
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -464,7 +464,7 @@ static void mcs_unwrap_fir(struct mcs_cb *mcs, __u8 *buf, int len)
        }
 
        fcs = ~(crc32_le(~0, buf, new_len));
-       if(fcs != le32_to_cpu(get_unaligned((__le32 *)(buf+new_len)))) {
+       if(fcs != get_unaligned_le32(buf + new_len)) {
                IRDA_ERROR("crc error calc 0x%x len %d\n", fcs, new_len);
                mcs->stats.rx_errors++;
                mcs->stats.rx_crc_errors++;
@@ -677,6 +677,8 @@ static int mcs_net_close(struct net_device *netdev)
        /* Stop transmit processing */
        netif_stop_queue(netdev);
 
+       kfree_skb(mcs->rx_buff.skb);
+
        /* kill and free the receive and transmit URBs */
        usb_kill_urb(mcs->rx_urb);
        usb_free_urb(mcs->rx_urb);