diff options
| author | Johan Hovold <johan@kernel.org> | 2021-05-19 14:47:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-05-19 13:11:39 -0700 |
| commit | 4d52ebc7ace491d58f96d1f4a1cb9070c506b2e7 (patch) | |
| tree | 08b8368180e743fc5f9ff6050517aba8ef393613 | |
| parent | d5b3bd6ab5418e34d85f64fba7c6ca02c3cbfb63 (diff) | |
| download | linux-4d52ebc7ace491d58f96d1f4a1cb9070c506b2e7.tar.bz2 | |
net: hso: bail out on interrupt URB allocation failure
Commit 31db0dbd7244 ("net: hso: check for allocation failure in
hso_create_bulk_serial_device()") recently started returning an error
when the driver fails to allocate resources for the interrupt endpoint
and tiocmget functionality.
For consistency let's bail out from probe also if the URB allocation
fails.
Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/hso.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index 260f850d69eb..b48b2a25210c 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -2635,14 +2635,14 @@ static struct hso_device *hso_create_bulk_serial_device( } tiocmget->urb = usb_alloc_urb(0, GFP_KERNEL); - if (tiocmget->urb) { - mutex_init(&tiocmget->mutex); - init_waitqueue_head(&tiocmget->waitq); - } else - hso_free_tiomget(serial); - } - else + if (!tiocmget->urb) + goto exit; + + mutex_init(&tiocmget->mutex); + init_waitqueue_head(&tiocmget->waitq); + } else { num_urbs = 1; + } if (hso_serial_common_create(serial, num_urbs, BULK_URB_RX_SIZE, BULK_URB_TX_SIZE)) |