Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e483536a authored by Dongliang Mu's avatar Dongliang Mu Committed by Greg Kroah-Hartman
Browse files

drivers: usb: smsusb: fix error handling code in smsusb_init_device 



[ Upstream commit b9c7141f384097fa4fa67d2f72e5731d628aef7c ]

The previous commit 4b208f8b ("[media] siano: register media controller
earlier")moves siano_media_device_register before smscore_register_device,
and adds corresponding error handling code if smscore_register_device
fails. However, it misses the following error handling code of
smsusb_init_device.

Fix this by moving error handling code at the end of smsusb_init_device
and adding a goto statement in the following error handling parts.

Fixes: 4b208f8b ("[media] siano: register media controller earlier")
Signed-off-by: default avatarDongliang Mu <dzm91@hust.edu.cn>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 23429423

drivers/media/usb/siano/smsusb.c

+11 −10
Original line number Diff line number Diff line
@@ -467,12 +467,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) 
	rc = smscore_register_device(&params, &dev->coredev, 0, mdev);

	if (rc < 0) {

		pr_err("smscore_register_device(...) failed, rc %d\n", rc);

		smsusb_term_device(intf);

#ifdef CONFIG_MEDIA_CONTROLLER_DVB

		media_device_unregister(mdev);

#endif

		kfree(mdev);

		return rc;

		goto err_unregister_device;

	}



	smscore_set_board_id(dev->coredev, board_id);
@@ -489,8 +484,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) 
	rc = smsusb_start_streaming(dev);

	if (rc < 0) {

		pr_err("smsusb_start_streaming(...) failed\n");

		smsusb_term_device(intf);

		return rc;

		goto err_unregister_device;

	}



	dev->state = SMSUSB_ACTIVE;
@@ -498,13 +492,20 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) 
	rc = smscore_start_device(dev->coredev);

	if (rc < 0) {

		pr_err("smscore_start_device(...) failed\n");

		smsusb_term_device(intf);

		return rc;

		goto err_unregister_device;

	}



	pr_debug("device 0x%p created\n", dev);



	return rc;



err_unregister_device:

	smsusb_term_device(intf);

#ifdef CONFIG_MEDIA_CONTROLLER_DVB

	media_device_unregister(mdev);

#endif

	kfree(mdev);

	return rc;

}



static int smsusb_probe(struct usb_interface *intf,