diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
commit | 9da305eb089c94c535d1790fd2dec16f44c1689f (patch) | |
tree | f37f07f148fd7a793233c7f15c0fa9f46212049d /drivers/media/dvb/dvb-core/dmxdev.c | |
parent | d96212ed87d032d2d830e265aae14038dc1f8ad8 (diff) | |
parent | 14ee0a1414536d27bc29373bf23c106b8ef8ce0b (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/media/dvb/dvb-core/dmxdev.c')
-rw-r--r-- | drivers/media/dvb/dvb-core/dmxdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c index 8028c3a5e287..7b8373ad121b 100644 --- a/drivers/media/dvb/dvb-core/dmxdev.c +++ b/drivers/media/dvb/dvb-core/dmxdev.c @@ -947,7 +947,7 @@ static int dvb_demux_do_ioctl(struct inode *inode, struct file *file, case DMX_GET_STC: if (!dmxdev->demux->get_stc) { - ret=-EINVAL; + ret=-EINVAL; break; } ret = dmxdev->demux->get_stc(dmxdev->demux, |