diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-cards.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-cards.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtv-cards.c b/drivers/media/video/ivtv/ivtv-cards.c index 87afbbee2063..145e4749a69d 100644 --- a/drivers/media/video/ivtv/ivtv-cards.c +++ b/drivers/media/video/ivtv/ivtv-cards.c | |||
@@ -405,7 +405,8 @@ static const struct ivtv_card ivtv_card_avc2410 = { | |||
405 | .hw_audio_ctrl = IVTV_HW_MSP34XX, | 405 | .hw_audio_ctrl = IVTV_HW_MSP34XX, |
406 | .hw_muxer = IVTV_HW_CS53L32A, | 406 | .hw_muxer = IVTV_HW_CS53L32A, |
407 | .hw_all = IVTV_HW_MSP34XX | IVTV_HW_CS53L32A | | 407 | .hw_all = IVTV_HW_MSP34XX | IVTV_HW_CS53L32A | |
408 | IVTV_HW_SAA7115 | IVTV_HW_TUNER, | 408 | IVTV_HW_SAA7115 | IVTV_HW_TUNER | |
409 | IVTV_HW_I2C_IR_RX_ADAPTEC, | ||
409 | .video_inputs = { | 410 | .video_inputs = { |
410 | { IVTV_CARD_INPUT_VID_TUNER, 0, IVTV_SAA71XX_COMPOSITE4 }, | 411 | { IVTV_CARD_INPUT_VID_TUNER, 0, IVTV_SAA71XX_COMPOSITE4 }, |
411 | { IVTV_CARD_INPUT_SVIDEO1, 1, IVTV_SAA71XX_SVIDEO0 }, | 412 | { IVTV_CARD_INPUT_SVIDEO1, 1, IVTV_SAA71XX_SVIDEO0 }, |
@@ -1313,7 +1314,6 @@ int ivtv_get_input(struct ivtv *itv, u16 index, struct v4l2_input *input) | |||
1313 | "Composite 3" | 1314 | "Composite 3" |
1314 | }; | 1315 | }; |
1315 | 1316 | ||
1316 | memset(input, 0, sizeof(*input)); | ||
1317 | if (index >= itv->nof_inputs) | 1317 | if (index >= itv->nof_inputs) |
1318 | return -EINVAL; | 1318 | return -EINVAL; |
1319 | input->index = index; | 1319 | input->index = index; |
@@ -1331,7 +1331,6 @@ int ivtv_get_output(struct ivtv *itv, u16 index, struct v4l2_output *output) | |||
1331 | { | 1331 | { |
1332 | const struct ivtv_card_output *card_output = itv->card->video_outputs + index; | 1332 | const struct ivtv_card_output *card_output = itv->card->video_outputs + index; |
1333 | 1333 | ||
1334 | memset(output, 0, sizeof(*output)); | ||
1335 | if (index >= itv->card->nof_outputs) | 1334 | if (index >= itv->card->nof_outputs) |
1336 | return -EINVAL; | 1335 | return -EINVAL; |
1337 | output->index = index; | 1336 | output->index = index; |