Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 192731
b: refs/heads/master
c: 762e17e
h: refs/heads/master
i:
  192729: 0984b83
  192727: c08c38b
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed May 18, 2010
1 parent c358f92 commit 1edf15f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f8960ee7a44d58d79aae063e46f3316e1d5748e0
refs/heads/master: 762e17eb520cf31daa46061818f13b0665e38d7f
11 changes: 6 additions & 5 deletions trunk/drivers/staging/tm6000/tm6000-cards.c
Original file line number Diff line number Diff line change
Expand Up @@ -453,11 +453,6 @@ static int tm6000_init_dev(struct tm6000_core *dev)
if (rc<0)
goto err;

/* register and initialize V4L2 */
rc=tm6000_v4l2_register(dev);
if (rc<0)
goto err;

/* Default values for STD and resolutions */
dev->width = 720;
dev->height = 480;
Expand All @@ -480,12 +475,18 @@ static int tm6000_init_dev(struct tm6000_core *dev)
v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
"tvaudio", "tvaudio", I2C_ADDR_TDA9874, NULL);

/* register and initialize V4L2 */
rc=tm6000_v4l2_register(dev);
if (rc<0)
goto err;

if(dev->caps.has_dvb) {
dev->dvb = kzalloc(sizeof(*(dev->dvb)), GFP_KERNEL);
if(!dev->dvb) {
rc = -ENOMEM;
goto err2;
}

#ifdef CONFIG_VIDEO_TM6000_DVB
rc = tm6000_dvb_register(dev);
if(rc < 0) {
Expand Down

0 comments on commit 1edf15f

Please sign in to comment.