diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-13 07:52:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-13 07:52:17 +0100 |
| commit | d40310f65771b3a1eb9af34af433136887a64251 (patch) | |
| tree | aca0913593f44daee3845d72cca5bbd827b39012 /drivers/staging/vt6656/main_usb.c | |
| parent | e895bc1ebb31750f3baa74e074617d3cc5d0cee2 (diff) | |
| parent | b3a987b0264d3ddbb24293ebff10eddfc472f653 (diff) | |
Merge 5.5-rc6 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/main_usb.c')
| -rw-r--r-- | drivers/staging/vt6656/main_usb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 131100510bb0..5e48b3ddb94c 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -949,7 +949,7 @@ static const struct ieee80211_ops vnt_mac_ops = { int vnt_init(struct vnt_private *priv) { - if (!(vnt_init_registers(priv))) + if (vnt_init_registers(priv)) return -EAGAIN; SET_IEEE80211_PERM_ADDR(priv->hw, priv->permanent_net_addr); @@ -992,6 +992,7 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id) priv = hw->priv; priv->hw = hw; priv->usb = udev; + priv->intf = intf; vnt_set_options(priv); |