diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:53:56 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:53:56 -0500 |
| commit | 61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch) | |
| tree | 2cf21d235f17e80d47fdb4ee1248865be8196d4d /drivers/media/video/zr36120_i2c.c | |
| parent | 9585da3729e7e27bf22818625c10ac6c64ebb609 (diff) | |
| parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/media/video/zr36120_i2c.c')
| -rw-r--r-- | drivers/media/video/zr36120_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/zr36120_i2c.c b/drivers/media/video/zr36120_i2c.c index 6bfe84d657f1..21fde43a6aed 100644 --- a/drivers/media/video/zr36120_i2c.c +++ b/drivers/media/video/zr36120_i2c.c | |||
| @@ -65,7 +65,7 @@ void attach_inform(struct i2c_bus *bus, int id) | |||
| 65 | case I2C_DRIVERID_VIDEODECODER: | 65 | case I2C_DRIVERID_VIDEODECODER: |
| 66 | DEBUG(printk(CARD_INFO "decoder attached\n",CARD)); | 66 | DEBUG(printk(CARD_INFO "decoder attached\n",CARD)); |
| 67 | 67 | ||
| 68 | /* fetch the capabilites of the decoder */ | 68 | /* fetch the capabilities of the decoder */ |
| 69 | rv = i2c_control_device(&ztv->i2c, I2C_DRIVERID_VIDEODECODER, DECODER_GET_CAPABILITIES, &dc); | 69 | rv = i2c_control_device(&ztv->i2c, I2C_DRIVERID_VIDEODECODER, DECODER_GET_CAPABILITIES, &dc); |
| 70 | if (rv) { | 70 | if (rv) { |
| 71 | DEBUG(printk(CARD_DEBUG "decoder is not V4L aware!\n",CARD)); | 71 | DEBUG(printk(CARD_DEBUG "decoder is not V4L aware!\n",CARD)); |