From ad8501d1430e21b1c7de5c5644357132e42da32e Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 29 Oct 2008 02:20:11 -0300 Subject: [PATCH] --- yaml --- r: 124123 b: refs/heads/master c: ac2657c10ccbba7b2c934681f17d7743deee3859 h: refs/heads/master i: 124121: d3f6d515364dcb6dd9ddb0d16c13f4dc726194e6 124119: e18ec26aff50e3b1d51a7acb202e6d22e9bb0e17 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-core/dvbdev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d8ba2a8f559d..939965cfdd1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08a66aea55154b50f9e9e2e89cc85d8b75121568 +refs/heads/master: ac2657c10ccbba7b2c934681f17d7743deee3859 diff --git a/trunk/drivers/media/dvb/dvb-core/dvbdev.c b/trunk/drivers/media/dvb/dvb-core/dvbdev.c index c7990c926942..92ec7f8826e0 100644 --- a/trunk/drivers/media/dvb/dvb-core/dvbdev.c +++ b/trunk/drivers/media/dvb/dvb-core/dvbdev.c @@ -251,7 +251,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, mutex_unlock(&dvbdev_register_lock); clsdev = device_create(dvb_class, adap->device, - MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), + MKDEV(DVB_MAJOR, minor, dvbdev, "dvb%d.%s%d", adap->num, dnames[type], id); if (IS_ERR(clsdev)) { printk(KERN_ERR "%s: failed to create device dvb%d.%s%d (%ld)\n",