Commit 3333447c authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Mauro Carvalho Chehab

[media] tlg2300: implement error handling in poseidon_probe()

All poseidon init functions properly return error codes,
but they are ignored by poseidon_probe(). The patch implements
handling of error cases.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 725d7b71
...@@ -436,12 +436,22 @@ static int poseidon_probe(struct usb_interface *interface, ...@@ -436,12 +436,22 @@ static int poseidon_probe(struct usb_interface *interface,
/* register v4l2 device */ /* register v4l2 device */
ret = v4l2_device_register(&interface->dev, &pd->v4l2_dev); ret = v4l2_device_register(&interface->dev, &pd->v4l2_dev);
if (ret)
goto err_v4l2;
/* register devices in directory /dev */ /* register devices in directory /dev */
ret = pd_video_init(pd); ret = pd_video_init(pd);
poseidon_audio_init(pd); if (ret)
poseidon_fm_init(pd); goto err_video;
pd_dvb_usb_device_init(pd); ret = poseidon_audio_init(pd);
if (ret)
goto err_audio;
ret = poseidon_fm_init(pd);
if (ret)
goto err_fm;
ret = pd_dvb_usb_device_init(pd);
if (ret)
goto err_dvb;
INIT_LIST_HEAD(&pd->device_list); INIT_LIST_HEAD(&pd->device_list);
list_add_tail(&pd->device_list, &pd_device_list); list_add_tail(&pd->device_list, &pd_device_list);
...@@ -459,6 +469,17 @@ static int poseidon_probe(struct usb_interface *interface, ...@@ -459,6 +469,17 @@ static int poseidon_probe(struct usb_interface *interface,
} }
#endif #endif
return 0; return 0;
err_dvb:
poseidon_fm_exit(pd);
err_fm:
poseidon_audio_free(pd);
err_audio:
pd_video_exit(pd);
err_video:
v4l2_device_unregister(&pd->v4l2_dev);
err_v4l2:
kfree(pd);
return ret;
} }
static void poseidon_disconnect(struct usb_interface *interface) static void poseidon_disconnect(struct usb_interface *interface)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment