diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-04-17 18:16:47 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2006-04-17 18:16:47 +0200 |
| commit | 392ad50208a490ee5ee73ac59e809ad366019c00 (patch) | |
| tree | d984365ac21a1d8fd40a49f62781b7e6ae9a78df /linux/drivers/media/dvb/dvb-core/dvbdev.c | |
| parent | f62b12acad6cf4c6e78bc2dd7e3e445f2d239d24 (diff) | |
| parent | 91263e7de241ee6403c43cd3a13206f749798ba6 (diff) | |
| download | mediapointer-dvb-s2-392ad50208a490ee5ee73ac59e809ad366019c00.tar.gz mediapointer-dvb-s2-392ad50208a490ee5ee73ac59e809ad366019c00.tar.bz2 | |
merge: from master
From: Patrick Boettcher <pb@linuxtv.org>
merge: from master
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core/dvbdev.c')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index 041ed7fd1..66d9ffdb4 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -247,7 +247,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, "dvb/adapter%d/%s%d", adap->num, dnames[type], id); class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), - NULL, "dvb%d.%s%d", adap->num, dnames[type], id); + adap->device, "dvb%d.%s%d", adap->num, dnames[type], id); dprintk("DVB: register adapter%d/%s%d @ minor: %i (0x%02x)\n", adap->num, dnames[type], id, nums2minor(adap->num, type, id), @@ -296,7 +296,7 @@ skip: } -int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct module *module) +int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct module *module, struct device *device) { int num; @@ -317,6 +317,7 @@ int dvb_register_adapter(struct dvb_adapter *adap, const char *name, struct modu adap->num = num; adap->name = name; adap->module = module; + adap->device = device; list_add_tail (&adap->list_head, &dvb_adapter_list); |