Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
media
/
usb
/
airspy
/
airspy.c
diff --git
a/kernel/drivers/media/usb/airspy/airspy.c
b/kernel/drivers/media/usb/airspy/airspy.c
index
565a593
..
34b35eb
100644
(file)
--- a/
kernel/drivers/media/usb/airspy/airspy.c
+++ b/
kernel/drivers/media/usb/airspy/airspy.c
@@
-1073,7
+1073,7
@@
static int airspy_probe(struct usb_interface *intf,
if (ret) {
dev_err(s->dev, "Failed to register as video device (%d)\n",
ret);
if (ret) {
dev_err(s->dev, "Failed to register as video device (%d)\n",
ret);
- goto err_
unregister_v4l2_dev
;
+ goto err_
free_controls
;
}
dev_info(s->dev, "Registered as %s\n",
video_device_node_name(&s->vdev));
}
dev_info(s->dev, "Registered as %s\n",
video_device_node_name(&s->vdev));
@@
-1082,7
+1082,6
@@
static int airspy_probe(struct usb_interface *intf,
err_free_controls:
v4l2_ctrl_handler_free(&s->hdl);
err_free_controls:
v4l2_ctrl_handler_free(&s->hdl);
-err_unregister_v4l2_dev:
v4l2_device_unregister(&s->v4l2_dev);
err_free_mem:
kfree(s);
v4l2_device_unregister(&s->v4l2_dev);
err_free_mem:
kfree(s);