diff options
Diffstat (limited to 'drivers/media/video/saa7164/saa7164-api.c')
-rw-r--r-- | drivers/media/video/saa7164/saa7164-api.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/saa7164/saa7164-api.c b/drivers/media/video/saa7164/saa7164-api.c index d05ba28cab2a..045d9094d9ad 100644 --- a/drivers/media/video/saa7164/saa7164-api.c +++ b/drivers/media/video/saa7164/saa7164-api.c | |||
@@ -436,11 +436,13 @@ int saa7164_api_set_videomux(struct saa7164_port *port) | |||
436 | SU_INPUT_SELECT_CONTROL, sizeof(u8), &port->mux_input); | 436 | SU_INPUT_SELECT_CONTROL, sizeof(u8), &port->mux_input); |
437 | if (ret != SAA_OK) | 437 | if (ret != SAA_OK) |
438 | printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret); | 438 | printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret); |
439 | |||
439 | /* Audio Mux */ | 440 | /* Audio Mux */ |
440 | ret = saa7164_cmd_send(port->dev, port->audfeat.sourceid, SET_CUR, | 441 | ret = saa7164_cmd_send(port->dev, port->audfeat.sourceid, SET_CUR, |
441 | SU_INPUT_SELECT_CONTROL, sizeof(u8), &inputs[ port->mux_input - 1 ]); | 442 | SU_INPUT_SELECT_CONTROL, sizeof(u8), &inputs[ port->mux_input - 1 ]); |
442 | if (ret != SAA_OK) | 443 | if (ret != SAA_OK) |
443 | printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret); | 444 | printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret); |
445 | |||
444 | /* Audio UnMute */ | 446 | /* Audio UnMute */ |
445 | ret = saa7164_api_audio_mute(port, 0); | 447 | ret = saa7164_api_audio_mute(port, 0); |
446 | if (ret != SAA_OK) | 448 | if (ret != SAA_OK) |
@@ -795,7 +797,6 @@ int saa7164_api_read_eeprom(struct saa7164_dev *dev, u8 *buf, int buflen) | |||
795 | ®[0], 128, buf); | 797 | ®[0], 128, buf); |
796 | } | 798 | } |
797 | 799 | ||
798 | |||
799 | int saa7164_api_configure_port_vbi(struct saa7164_dev *dev, | 800 | int saa7164_api_configure_port_vbi(struct saa7164_dev *dev, |
800 | struct saa7164_port *port) | 801 | struct saa7164_port *port) |
801 | { | 802 | { |
@@ -1459,7 +1460,6 @@ int saa7164_api_i2c_write(struct saa7164_i2c *bus, u8 addr, u32 datalen, | |||
1459 | return ret == SAA_OK ? 0 : -EIO; | 1460 | return ret == SAA_OK ? 0 : -EIO; |
1460 | } | 1461 | } |
1461 | 1462 | ||
1462 | |||
1463 | int saa7164_api_modify_gpio(struct saa7164_dev *dev, u8 unitid, | 1463 | int saa7164_api_modify_gpio(struct saa7164_dev *dev, u8 unitid, |
1464 | u8 pin, u8 state) | 1464 | u8 pin, u8 state) |
1465 | { | 1465 | { |
@@ -1496,5 +1496,3 @@ int saa7164_api_clear_gpiobit(struct saa7164_dev *dev, u8 unitid, | |||
1496 | return saa7164_api_modify_gpio(dev, unitid, pin, 0); | 1496 | return saa7164_api_modify_gpio(dev, unitid, pin, 0); |
1497 | } | 1497 | } |
1498 | 1498 | ||
1499 | |||
1500 | |||