diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 13:10:23 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 13:10:23 -0400 |
| commit | a4e0d9af403d099e751797f6cc69e4a8e2d78ef1 (patch) | |
| tree | 6f4afdffe5dbaad7529be987b8c3259a07395031 /drivers/media | |
| parent | c60f2b5c1defb6b1345968e1c65c2008c221d57d (diff) | |
| parent | c010b2f76c3032e48097a6eef291d8593d5d79a6 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/dvb/dvb-core/dvbdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c index e208a60c048a..e7132770a3bf 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.c +++ b/drivers/media/dvb/dvb-core/dvbdev.c | |||
| @@ -233,9 +233,9 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, | |||
| 233 | 233 | ||
| 234 | mutex_unlock(&dvbdev_register_lock); | 234 | mutex_unlock(&dvbdev_register_lock); |
| 235 | 235 | ||
| 236 | clsdev = device_create(dvb_class, adap->device, | 236 | clsdev = device_create_drvdata(dvb_class, adap->device, |
| 237 | MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), | 237 | MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), |
| 238 | "dvb%d.%s%d", adap->num, dnames[type], id); | 238 | NULL, "dvb%d.%s%d", adap->num, dnames[type], id); |
| 239 | if (IS_ERR(clsdev)) { | 239 | if (IS_ERR(clsdev)) { |
| 240 | printk(KERN_ERR "%s: failed to create device dvb%d.%s%d (%ld)\n", | 240 | printk(KERN_ERR "%s: failed to create device dvb%d.%s%d (%ld)\n", |
| 241 | __func__, adap->num, dnames[type], id, PTR_ERR(clsdev)); | 241 | __func__, adap->num, dnames[type], id, PTR_ERR(clsdev)); |