Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 181642
b: refs/heads/master
c: 44cdd06
h: refs/heads/master
v: v3
  • Loading branch information
Oliver Endriss authored and Mauro Carvalho Chehab committed Feb 26, 2010
1 parent e41d11e commit 4d3aa54
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 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: 236fa316baf6bb89b2f361230d570093a2a79794
refs/heads/master: 44cdd064aa698c033e0a345ed187db7c24134d93
14 changes: 8 additions & 6 deletions trunk/drivers/media/dvb/ngene/ngene-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -728,9 +728,11 @@ int ngene_command_stream_control(struct ngene *dev, u8 stream, u8 control,
com.in_len = sizeof(struct FW_STREAM_CONTROL);
com.out_len = 0;

printk(KERN_INFO DEVICE_NAME ": Stream=%02x, Control=%02x, Mode=%02x\n",
com.cmd.StreamControl.Stream, com.cmd.StreamControl.Control,
com.cmd.StreamControl.Mode);
dprintk(KERN_INFO DEVICE_NAME
": Stream=%02x, Control=%02x, Mode=%02x\n",
com.cmd.StreamControl.Stream, com.cmd.StreamControl.Control,
com.cmd.StreamControl.Mode);

chan->Mode = mode;

if (!(control & 0x80)) {
Expand Down Expand Up @@ -1042,7 +1044,7 @@ static int i2c_write_eeprom(struct i2c_adapter *adapter,
.len = sizeof(m)};

if (i2c_transfer(adapter, &msg, 1) != 1) {
dprintk(KERN_DEBUG DEVICE_NAME ": Error writing EEPROM!\n");
dprintk(KERN_ERR DEVICE_NAME ": Error writing EEPROM!\n");
return -EIO;
}
return 0;
Expand All @@ -1058,7 +1060,7 @@ static int i2c_read_eeprom(struct i2c_adapter *adapter,
.buf = data, .len = len} };

if (i2c_transfer(adapter, msgs, 2) != 2) {
dprintk(KERN_DEBUG DEVICE_NAME ": Error reading EEPROM\n");
dprintk(KERN_ERR DEVICE_NAME ": Error reading EEPROM\n");
return -EIO;
}
return 0;
Expand Down Expand Up @@ -2331,7 +2333,7 @@ static int ngene_start(struct ngene *dev)
bconf = hdtv_config;
ngene_reset_decypher(dev);
}
printk(KERN_INFO DEVICE_NAME ": FW 17 buffer config\n");
dprintk(KERN_DEBUG DEVICE_NAME ": FW 17 buffer config\n");
stat = ngene_command_config_free_buf(dev, bconf);
} else {
int bconf = BUFFER_CONFIG_4422;
Expand Down

0 comments on commit 4d3aa54

Please sign in to comment.