diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2019-12-20 21:15:59 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-14 20:03:04 +0100 |
| commit | 9a71be229d5fa4c13758d5b744535574eab976cf (patch) | |
| tree | d0960bce51f57a03a459bc8700188887879a84a0 /drivers/staging | |
| parent | a69b03e5b50b42f1842f5af71c63057d93cc7573 (diff) | |
| download | linux-stable-9a71be229d5fa4c13758d5b744535574eab976cf.tar.gz linux-stable-9a71be229d5fa4c13758d5b744535574eab976cf.tar.bz2 linux-stable-9a71be229d5fa4c13758d5b744535574eab976cf.zip | |
staging: vt6656: set usb_set_intfdata on driver fail.
commit c0bcf9f3f5b661d4ace2a64a79ef661edd2a4dc8 upstream.
intfdata will contain stale pointer when the device is detached after
failed initialization when referenced in vt6656_disconnect
Provide driver access to it here and NULL it.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Link: https://lore.kernel.org/r/6de448d7-d833-ef2e-dd7b-3ef9992fee0e@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/vt6656/device.h | 1 | ||||
| -rw-r--r-- | drivers/staging/vt6656/main_usb.c | 1 | ||||
| -rw-r--r-- | drivers/staging/vt6656/wcmd.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index dec36f296f3d..ba362a883016 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -272,6 +272,7 @@ struct vnt_private { u8 mac_hw; /* netdev */ struct usb_device *usb; + struct usb_interface *intf; u64 tsf_time; u8 rx_rate; diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index f35ee85f61b5..668fcd3a0bfe 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -979,6 +979,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); diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 3cbf4791bac1..de541b85f8a5 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -113,6 +113,7 @@ void vnt_run_command(struct work_struct *work) if (vnt_init(priv)) { /* If fail all ends TODO retry */ dev_err(&priv->usb->dev, "failed to start\n"); + usb_set_intfdata(priv->intf, NULL); ieee80211_free_hw(priv->hw); return; } |