Commit 6a5cde56 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] dvbdev fixes

From: Monchi Abbad <kernel@axion.demon.nl>

I found a mistake in the dvbdev.c file when creating the dvb /devfs files,
it created /dev/dvb/adapter0device0 instead of /dev/dvb/adapter0/device0.
But here is a simple fix.
parent 7ae286bc
...@@ -220,9 +220,9 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, ...@@ -220,9 +220,9 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
devfs_mk_cdev(MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), devfs_mk_cdev(MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
S_IFCHR | S_IRUSR | S_IWUSR, S_IFCHR | S_IRUSR | S_IWUSR,
"dvb/adapter%d%s%d", adap->num, dnames[type], id); "dvb/adapter%d/%s%d", adap->num, dnames[type], id);
dprintk("DVB: register adapter%d%s%d @ minor: %i (0x%02x)\n", dprintk("DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n",
adap->num, dnames[type], id, nums2minor(adap->num, type, id), adap->num, dnames[type], id, nums2minor(adap->num, type, id),
nums2minor(adap->num, type, id)); nums2minor(adap->num, type, id));
...@@ -233,7 +233,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, ...@@ -233,7 +233,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
void dvb_unregister_device(struct dvb_device *dvbdev) void dvb_unregister_device(struct dvb_device *dvbdev)
{ {
if (dvbdev) { if (dvbdev) {
devfs_remove("dvb/adapter%d%s%d", dvbdev->adapter->num, devfs_remove("dvb/adapter%d/%s%d", dvbdev->adapter->num,
dnames[dvbdev->type], dvbdev->id); dnames[dvbdev->type], dvbdev->id);
list_del(&dvbdev->list_head); list_del(&dvbdev->list_head);
kfree(dvbdev); kfree(dvbdev);
......
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