From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 17 Nov 2011 19:15:47 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v4.13~13123^2~5^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c4be3c2da1ab4344d3d5f63d6ec1952a3c6e635c;hp=-c;p=mirror_ubuntu-bionic-kernel.git

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

c4be3c2da1ab4344d3d5f63d6ec1952a3c6e635c
diff --combined drivers/net/wireless/libertas/if_spi.c
index 11b69b300dc0,7059d9645dab..728baa445259
--- a/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;