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

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / libertas / if_spi.c

diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index 622ae6de0d8bfc31161ba687f0e4f35a0976b08d..50b1ee7721e99254120c00722345f62e540d321b 100644 (file)
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -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 @@ static int if_spi_host_to_card(struct lbs_private *priv,
                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;
@@ -1290,7 +1291,6 @@ static struct spi_driver libertas_spi_driver = {
        .remove = __devexit_p(libertas_spi_remove),
        .driver = {
                .name   = "libertas_spi",
-               .bus    = &spi_bus_type,
                .owner  = THIS_MODULE,
                .pm     = &if_spi_pm_ops,
        },