diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 08:41:14 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 08:41:14 +0100 |
| commit | cfb13c5db08c90311a5defdde9a0328ee788cca5 (patch) | |
| tree | 842cb60d1d19b99e550fdbc653723e4b13e51ee5 /drivers/media/video/au0828/au0828-cards.c | |
| parent | of/net: Move of_get_mac_address() to a common source file. (diff) | |
| parent | Linux 2.6.37-rc7 (diff) | |
| download | linux-cfb13c5db08c90311a5defdde9a0328ee788cca5.tar.xz linux-cfb13c5db08c90311a5defdde9a0328ee788cca5.zip | |
Merge commit 'v2.6.37-rc7' into devicetree/next
Diffstat (limited to 'drivers/media/video/au0828/au0828-cards.c')
| -rw-r--r-- | drivers/media/video/au0828/au0828-cards.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c index 0453816d4ec3..01be89fa5c78 100644 --- a/drivers/media/video/au0828/au0828-cards.c +++ b/drivers/media/video/au0828/au0828-cards.c @@ -212,7 +212,7 @@ void au0828_card_setup(struct au0828_dev *dev) be abstracted out if we ever need to support a different demod) */ sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap, - NULL, "au8522", 0x8e >> 1, NULL); + "au8522", 0x8e >> 1, NULL); if (sd == NULL) printk(KERN_ERR "analog subdev registration failed\n"); } @@ -221,7 +221,7 @@ void au0828_card_setup(struct au0828_dev *dev) if (dev->board.tuner_type != TUNER_ABSENT) { /* Load the tuner module, which does the attach */ sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap, - NULL, "tuner", dev->board.tuner_addr, NULL); + "tuner", dev->board.tuner_addr, NULL); if (sd == NULL) printk(KERN_ERR "tuner subdev registration fail\n"); |