diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-07-21 20:03:34 -0700 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-07-21 20:03:34 -0700 |
| commit | 50002dfa8016241804a2e3b31a4605b5fe162d96 (patch) | |
| tree | 0cb84abe77c78944fdc2b641514875f92a7a8fb7 /linux/drivers/media/dvb | |
| parent | 1e8b64a5a2eb8de81731c5b02a4df9e6b9660708 (diff) | |
| download | mediapointer-dvb-s2-50002dfa8016241804a2e3b31a4605b5fe162d96.tar.gz mediapointer-dvb-s2-50002dfa8016241804a2e3b31a4605b5fe162d96.tar.bz2 | |
backport commit a9b12619f7b6f19c871437ec24a088787a04b1de
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Author: Greg Kroah-Hartman <gregkh@suse.de>
device create: misc: convert device_create_drvdata to device_create
Now that device_create() has been audited, rename things back to the
original call to be sane.
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index 422af5a0d..c2e824710 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -242,7 +242,11 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, mutex_unlock(&dvbdev_register_lock); -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 26) +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27) + clsdev = device_create(dvb_class, adap->device, + MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), + NULL, "dvb%d.%s%d", adap->num, dnames[type], id); +#elif LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 27) clsdev = device_create_drvdata(dvb_class, adap->device, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), NULL, "dvb%d.%s%d", adap->num, dnames[type], id); |