Commit cba99ae8 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8778): radio: fix incorrect video_register_device result check 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6c9de528

drivers/media/radio/dsbr100.c

+1 −1
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int usb_dsbr100_probe(struct usb_interface *intf, 
	radio->usbdev = interface_to_usbdev(intf);

	radio->curfreq = FREQ_MIN*FREQ_MUL;

	video_set_drvdata(radio->videodev, radio);

	if (video_register_device(radio->videodev, VFL_TYPE_RADIO,radio_nr)) {

	if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr) < 0) {

		warn("Could not register video device");

		video_device_release(radio->videodev);

		kfree(radio->transfer_buffer);

drivers/media/radio/radio-aimslab.c

+1 −2
Original line number Diff line number Diff line
@@ -426,8 +426,7 @@ static int __init rtrack_init(void) 


	rtrack_radio.priv=&rtrack_unit;



	if(video_register_device(&rtrack_radio, VFL_TYPE_RADIO, radio_nr)==-1)

	{

	if (video_register_device(&rtrack_radio, VFL_TYPE_RADIO, radio_nr) < 0) {

		release_region(io, 2);

		return -EINVAL;

	}

drivers/media/radio/radio-aztech.c

+1 −2
Original line number Diff line number Diff line
@@ -394,8 +394,7 @@ static int __init aztech_init(void) 
	mutex_init(&lock);

	aztech_radio.priv=&aztech_unit;



	if(video_register_device(&aztech_radio, VFL_TYPE_RADIO, radio_nr)==-1)

	{

	if (video_register_device(&aztech_radio, VFL_TYPE_RADIO, radio_nr) < 0) {

		release_region(io,2);

		return -EINVAL;

	}

drivers/media/radio/radio-cadet.c

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ static int __init cadet_init(void) 
	}

	if (!request_region(io,2,"cadet"))

		goto fail;

	if(video_register_device(&cadet_radio,VFL_TYPE_RADIO,radio_nr)==-1) {

	if (video_register_device(&cadet_radio, VFL_TYPE_RADIO, radio_nr) < 0) {

		release_region(io,2);

		goto fail;

	}

drivers/media/radio/radio-gemtek-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci 
	}

	*devradio = vdev_template;



	if ( video_register_device( devradio, VFL_TYPE_RADIO , nr_radio) == -1 ) {

	if (video_register_device(devradio, VFL_TYPE_RADIO, nr_radio) < 0) {

		kfree( devradio );

		goto err_video;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE