#Applies against: 2.6.17
#Signed-off-by: Uwe Bugla <uwe.bugla@xxxxxx>
#Changes: fix type and / or tab errors, wipes out uncommented material
--- a/drivers/media/dvb/dvb-core/dvbdev.c 2006-05-27 14:03:00
+++ b/drivers/media/dvb/dvb-core/dvbdev.c 2006-05-28 18:27:00
@@ -189,13 +189,11 @@
goto skip;
}
return id;
-skip:
+ skip:
id++;
}
return -ENFILE;
}
-
-
int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
const struct dvb_device *template, void *priv, int type)
{
@@ -277,21 +275,16 @@
goto skip;
}
return num;
-skip:
+ skip:
num++;
}
-
return -ENFILE;
}
-
-
int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct module *module)
{
int num;
-
if (mutex_lock_interruptible(&dvbdev_register_lock))
return -ERESTARTSYS;
-
if ((num = dvbdev_get_free_adapter_num ()) < 0) {
mutex_unlock(&dvbdev_register_lock);
return -ENFILE;
@@ -387,17 +380,14 @@
err = -EFAULT;
break;
}
-
-out:
+ out:
kfree(mbuf);
return err;
}
-
static int __init init_dvbdev(void)
{
int retval;
dev_t dev = MKDEV(DVB_MAJOR, 0);
-
if ((retval = register_chrdev_region(dev, MAX_DVB_MINORS, "DVB")) != 0) {
printk("dvb-core: unable to get major %d\n", DVB_MAJOR);
return retval;
@@ -417,8 +407,7 @@
goto error;
}
return 0;
-
-error:
+ error:
cdev_del(&dvb_device_cdev);
unregister_chrdev_region(dev, MAX_DVB_MINORS);
return retval;
--
Echte DSL-Flatrate dauerhaft für 0,- Euro*!
"Feel free" mit GMX DSL! http://www.gmx.net/de/go/dsl
_______________________________________________
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb
