diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2015-12-23 08:30:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-12-23 08:30:28 +0100 |
| commit | 0fb0b822d157325b66c503d23332f64899bfb828 (patch) | |
| tree | 0699437223be8c87a9c4951c46a5fe27681d57e5 /drivers/net/ethernet/intel/i40evf/i40e_adminq.c | |
| parent | ALSA: hda/realtek - Fix silent headphone output on MacPro 4,1 (v2) (diff) | |
| parent | Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/es8328', 'asoc/fix/fsl-sai', 'asoc/fix/rockchip', 'asoc/fix/sgtl5000' and 'asoc/fix/wm8974' into asoc-linus (diff) | |
| download | linux-dev-0fb0b822d157325b66c503d23332f64899bfb828.tar.xz linux-dev-0fb0b822d157325b66c503d23332f64899bfb828.zip | |
Merge tag 'asoc-fix-v4.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.4
A collection of small driver specific fixes here, nothing that'll affect
users who don't have the devices concerned. At least the wm8974 bug
indicates that there's not too many users of some of these devices.
Diffstat (limited to 'drivers/net/ethernet/intel/i40evf/i40e_adminq.c')
| -rw-r--r-- | drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq.c b/drivers/net/ethernet/intel/i40evf/i40e_adminq.c index fd123ca60761..3f65e39b3fe4 100644 --- a/drivers/net/ethernet/intel/i40evf/i40e_adminq.c +++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq.c @@ -551,10 +551,6 @@ i40e_status i40evf_init_adminq(struct i40e_hw *hw) goto init_adminq_exit; } - /* initialize locks */ - mutex_init(&hw->aq.asq_mutex); - mutex_init(&hw->aq.arq_mutex); - /* Set up register offsets */ i40e_adminq_init_regs(hw); @@ -596,8 +592,6 @@ i40e_status i40evf_shutdown_adminq(struct i40e_hw *hw) i40e_shutdown_asq(hw); i40e_shutdown_arq(hw); - /* destroy the locks */ - if (hw->nvm_buff.va) i40e_free_virt_mem(hw, &hw->nvm_buff); |