Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 193579
b: refs/heads/master
c: 4a28ea9
h: refs/heads/master
i:
  193577: 3782190
  193575: 8991de6
v: v3
  • Loading branch information
Jonathan Corbet committed May 11, 2010
1 parent 3c5c6da commit e740b79
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: 64a6bd6a570c53f1955eaedf3952dcbe9b62da1d
refs/heads/master: 4a28ea9cedaa673b8a1a7f84628d784d020f3b47
6 changes: 2 additions & 4 deletions trunk/drivers/video/via/via_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static void via_i2c_setscl(void *data, int state)
val |= 0x80;
break;
default:
DEBUG_MSG("viafb_i2c: specify wrong i2c type.\n");
printk(KERN_ERR "viafb_i2c: specify wrong i2c type.\n");
}
via_write_reg(adap_data->io_port, adap_data->ioport_index, val);
spin_unlock_irqrestore(&i2c_vdev->reg_lock, flags);
Expand Down Expand Up @@ -104,7 +104,7 @@ static void via_i2c_setsda(void *data, int state)
val |= 0x40;
break;
default:
DEBUG_MSG("viafb_i2c: specify wrong i2c type.\n");
printk(KERN_ERR "viafb_i2c: specify wrong i2c type.\n");
}
via_write_reg(adap_data->io_port, adap_data->ioport_index, val);
spin_unlock_irqrestore(&i2c_vdev->reg_lock, flags);
Expand Down Expand Up @@ -175,8 +175,6 @@ static int create_i2c_bus(struct i2c_adapter *adapter,
struct via_port_cfg *adap_cfg,
struct pci_dev *pdev)
{
DEBUG_MSG(KERN_DEBUG "viafb: creating bus adap=0x%p, algo_bit_data=0x%p, adap_cfg=0x%p\n", adapter, algo, adap_cfg);

algo->setsda = via_i2c_setsda;
algo->setscl = via_i2c_setscl;
algo->getsda = via_i2c_getsda;
Expand Down

0 comments on commit e740b79

Please sign in to comment.