diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-29 10:51:00 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-29 10:51:00 -0200 |
| commit | 7c0917f006a519be5e54c6405f54dea61ca06b7a (patch) | |
| tree | 47a8e3218398355b7ba1cdf59b9390afa003fdc9 /linux/drivers/media/dvb/dvb-core/dvbdev.c | |
| parent | b1ccf703c9015bc3257716ffccd33ca147f7a1a8 (diff) | |
| parent | 68a6fa1ae421b7c28eb6b8365f3adfd08007e7b7 (diff) | |
| download | mediapointer-dvb-s2-7c0917f006a519be5e54c6405f54dea61ca06b7a.tar.gz mediapointer-dvb-s2-7c0917f006a519be5e54c6405f54dea61ca06b7a.tar.bz2 | |
commit backport
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core/dvbdev.c')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index 4267b2b87..4609e3ebd 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -84,6 +84,10 @@ static int dvb_device_open(struct inode *inode, struct file *file) file->private_data = dvbdev; old_fops = file->f_op; file->f_op = fops_get(dvbdev->fops); + if (file->f_op == NULL) { + file->f_op = old_fops; + goto fail; + } if(file->f_op->open) err = file->f_op->open(inode,file); if (err) { @@ -95,6 +99,7 @@ static int dvb_device_open(struct inode *inode, struct file *file) unlock_kernel(); return err; } +fail: up_read(&minor_rwsem); unlock_kernel(); return -ENODEV; @@ -232,8 +237,8 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, dvbdev->fops = dvbdevfops; init_waitqueue_head (&dvbdev->wait_queue); - memcpy(dvbdev->fops, template->fops, sizeof(struct file_operations)); - dvbdev->fops->owner = adap->module; + memcpy(dvbdevfops, template->fops, sizeof(struct file_operations)); + dvbdevfops->owner = adap->module; list_add_tail (&dvbdev->list_head, &adap->device_list); |