Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --combined drivers/net/wireless/libertas/if_spi.c
index 11b69b300dc0821e52980fef3d248a50377f026a,7059d9645dab607e749634e3a868d8321b71b360..728baa445259c5ead043fa2540017c6d9ee19135
--- 1/drivers/net/wireless/libertas/if_spi.c
--- 2/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@@ -21,7 -21,7 +21,7 @@@
  
  #include <linux/hardirq.h>
  #include <linux/interrupt.h>
 -#include <linux/moduleparam.h>
 +#include <linux/module.h>
  #include <linux/firmware.h>
  #include <linux/jiffies.h>
  #include <linux/list.h>
@@@ -995,6 -995,7 +995,7 @@@ static int if_spi_host_to_card(struct l
                spin_unlock_irqrestore(&card->buffer_lock, flags);
                break;
        default:
+               kfree(packet);
                netdev_err(priv->dev, "can't transfer buffer of type %d\n",
                           type);
                err = -EINVAL;