Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14099
b: refs/heads/master
c: 419d4e7
h: refs/heads/master
i:
  14097: 743f9c4
  14095: eb3eeae
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Nov 14, 2005
1 parent 0952ec4 commit ce7e7a1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 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: cfbb5b8cb059609696ba38a9a87eafb93b3de43c
refs/heads/master: 419d4e753a5dbd6e19ad45cb4045ac213f15eac4
16 changes: 8 additions & 8 deletions trunk/drivers/media/video/saa7127.c
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ static int saa7127_write_inittab(struct i2c_client *client,

static int saa7127_set_vps(struct i2c_client *client, struct v4l2_sliced_vbi_data *data)
{
struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client);
struct saa7127_state *state = i2c_get_clientdata(client);
int enable = (data->line != 0);

if (enable && (data->field != 0 || data->line != 16))
Expand Down Expand Up @@ -391,7 +391,7 @@ static int saa7127_set_vps(struct i2c_client *client, struct v4l2_sliced_vbi_dat

static int saa7127_set_cc(struct i2c_client *client, struct v4l2_sliced_vbi_data *data)
{
struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client);
struct saa7127_state *state = i2c_get_clientdata(client);
u16 cc = data->data[0] << 8 | data->data[1];
int enable = (data->line != 0);

Expand All @@ -417,7 +417,7 @@ static int saa7127_set_cc(struct i2c_client *client, struct v4l2_sliced_vbi_data

static int saa7127_set_xds(struct i2c_client *client, struct v4l2_sliced_vbi_data *data)
{
struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client);
struct saa7127_state *state = i2c_get_clientdata(client);
u16 xds = data->data[1] << 8 | data->data[0];
int enable = (data->line != 0);

Expand All @@ -443,7 +443,7 @@ static int saa7127_set_xds(struct i2c_client *client, struct v4l2_sliced_vbi_dat

static int saa7127_set_wss(struct i2c_client *client, struct v4l2_sliced_vbi_data *data)
{
struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client);
struct saa7127_state *state = i2c_get_clientdata(client);
int enable = (data->line != 0);

if (enable && (data->field != 0 || data->line != 23))
Expand All @@ -467,7 +467,7 @@ static int saa7127_set_wss(struct i2c_client *client, struct v4l2_sliced_vbi_dat

static int saa7127_set_video_enable(struct i2c_client *client, int enable)
{
struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client);
struct saa7127_state *state = i2c_get_clientdata(client);

if (enable) {
saa7127_dbg("Enable Video Output\n");
Expand All @@ -486,7 +486,7 @@ static int saa7127_set_video_enable(struct i2c_client *client, int enable)

static int saa7127_set_std(struct i2c_client *client, v4l2_std_id std)
{
struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client);
struct saa7127_state *state = i2c_get_clientdata(client);
const struct i2c_reg_value *inittab;

if (std & V4L2_STD_525_60) {
Expand All @@ -509,7 +509,7 @@ static int saa7127_set_std(struct i2c_client *client, v4l2_std_id std)

static int saa7127_set_output_type(struct i2c_client *client, int output)
{
struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client);
struct saa7127_state *state = i2c_get_clientdata(client);

switch (output) {
case SAA7127_OUTPUT_TYPE_RGB:
Expand Down Expand Up @@ -558,7 +558,7 @@ static int saa7127_set_output_type(struct i2c_client *client, int output)

static int saa7127_set_input_type(struct i2c_client *client, int input)
{
struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client);
struct saa7127_state *state = i2c_get_clientdata(client);

switch (input) {
case SAA7127_INPUT_TYPE_NORMAL: /* avia */
Expand Down

0 comments on commit ce7e7a1

Please sign in to comment.