diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-09 13:43:18 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-09 13:43:18 +0100 |
| commit | 9a14a1f6284c0a5d3bbbb4ccfea8b6959ca63d83 (patch) | |
| tree | 5c8e9c1cc4365cee43e407eb72871d5ba4b08357 /drivers/media/usb/dvb-usb/dvb-usb-urb.c | |
| parent | dc6fa31dd7b294f586a07d5929ae3765ddbf86f3 (diff) | |
| parent | cd7c926fa65431a20a044f55dbd7609beaffbe46 (diff) | |
Merge remote-tracking branch 'fslc/4.14-2.3.x-imx' into toradex_4.14-2.3.x-imx
Conflicts:
arch/arm64/boot/dts/freescale/Makefile
arch/arm64/boot/dts/freescale/fsl-imx8qm-device.dtsi
Diffstat (limited to 'drivers/media/usb/dvb-usb/dvb-usb-urb.c')
| -rw-r--r-- | drivers/media/usb/dvb-usb/dvb-usb-urb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-urb.c b/drivers/media/usb/dvb-usb/dvb-usb-urb.c index c1b4e94a37f8..2aabf90d8697 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-urb.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-urb.c @@ -12,7 +12,7 @@ int dvb_usb_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen, int delay_ms) { - int actlen,ret = -ENOMEM; + int actlen = 0, ret = -ENOMEM; if (!d || wbuf == NULL || wlen == 0) return -EINVAL; |