14 files changed, 15 insertions, 23 deletions

diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 1ed88f3abe61..70c65a745923 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -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);
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index eba9209b3024..1f064f4b32df 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -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;
         }
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 3fe5504428c5..628c689e3ffe 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -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;
         }
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 6166e726ed72..04c3698d32e4 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -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;
         }
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index 36e754e3ffb2..5cd7f032298d 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -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;
         }
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 2b1a6221de6d..0a0f956bb308 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -612,8 +612,7 @@ static int __init gemtek_init(void)
 
         gemtek_radio.priv = &gemtek_unit;
 
-        if (video_register_device(&gemtek_radio, VFL_TYPE_RADIO,
-                radio_nr) == -1) {
+        if (video_register_device(&gemtek_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 1);
                 return -EBUSY;
         }
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index 0ada1c697e8a..9ef0a763eeb7 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -409,8 +409,7 @@ static int __devinit maestro_probe(struct pci_dev *pdev,
         video_set_drvdata(maestro_radio_inst, radio_unit);
         pci_set_drvdata(pdev, maestro_radio_inst);
 
-        retval = video_register_device(maestro_radio_inst, VFL_TYPE_RADIO,
-                radio_nr);
+        retval = video_register_device(maestro_radio_inst, VFL_TYPE_RADIO, radio_nr);
         if (retval) {
                 printk(KERN_ERR "can't register video device!\n");
                 goto errfr1;
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index e210da161566..0cc6fcb041fd 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -410,7 +410,7 @@ static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_d
         mutex_init(&radio_unit.lock);
         maxiradio_radio.priv = &radio_unit;
 
-        if (video_register_device(&maxiradio_radio, VFL_TYPE_RADIO, radio_nr)==-1) {
+        if (video_register_device(&maxiradio_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 printk("radio-maxiradio: can't register device!");
                 goto err_out_free_region;
         }
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index e2dde0807268..6d820e2481e7 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -332,8 +332,7 @@ static int __init rtrack2_init(void)
         rtrack2_radio.priv=&rtrack2_unit;
 
         spin_lock_init(&lock);
-        if(video_register_device(&rtrack2_radio, VFL_TYPE_RADIO, radio_nr)==-1)
-        {
+        if (video_register_device(&rtrack2_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 4);
                 return -EINVAL;
         }
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index bb5d92f104af..0d478f54a907 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -377,7 +377,7 @@ static int __init fmi_init(void)
 
         mutex_init(&lock);
 
-        if (video_register_device(&fmi_radio, VFL_TYPE_RADIO, radio_nr) == -1) {
+        if (video_register_device(&fmi_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 2);
                 return -EINVAL;
         }
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index a4984ff87c9c..16c7ef20265c 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -1694,8 +1694,8 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
         INIT_DELAYED_WORK(&radio->work, si470x_work);
 
         /* register video device */
-        if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr)) {
-                retval = -EIO;
+        retval = video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr);
+        if (retval) {
                 printk(KERN_WARNING DRIVER_NAME
                                 ": Could not register video device\n");
                 goto err_all;
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index cefa44fc5aed..0876fecc5f27 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -405,8 +405,7 @@ static int __init terratec_init(void)
 
         spin_lock_init(&lock);
 
-        if(video_register_device(&terratec_radio, VFL_TYPE_RADIO, radio_nr)==-1)
-        {
+        if (video_register_device(&terratec_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io,2);
                 return -EINVAL;
         }
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index d70172d23edb..193161956253 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -378,8 +378,7 @@ static int __init trust_init(void)
                 printk(KERN_ERR "trust: port 0x%x already in use\n", io);
                 return -EBUSY;
         }
-        if(video_register_device(&trust_radio, VFL_TYPE_RADIO, radio_nr)==-1)
-        {
+        if (video_register_device(&trust_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 2);
                 return -EINVAL;
         }
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 9f17a332fa11..51d57ed3b3e1 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -446,8 +446,7 @@ static int __init zoltrix_init(void)
                 return -EBUSY;
         }
 
-        if (video_register_device(&zoltrix_radio, VFL_TYPE_RADIO, radio_nr) == -1)
-        {
+        if (video_register_device(&zoltrix_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
                 release_region(io, 2);
                 return -EINVAL;
         }