diff --git a/[refs] b/[refs] index 90daa2e373e0..3812e7fe226c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ce21ecdf500edfa0123238f40d3fb592a44d9f3 +refs/heads/master: b2704e1540b297c06efa96851949ed060bd0d2bb diff --git a/trunk/drivers/staging/media/go7007/wis-tw9903.c b/trunk/drivers/staging/media/go7007/wis-tw9903.c index 854919e81547..684ca37f0382 100644 --- a/trunk/drivers/staging/media/go7007/wis-tw9903.c +++ b/trunk/drivers/staging/media/go7007/wis-tw9903.c @@ -127,8 +127,8 @@ static int wis_tw9903_command(struct i2c_client *client, 0x06, 0xc0, /* reset device */ 0, 0, }; - printk(KERN_DEBUG "vscale is %04x, hscale is %04x\n", - vscale, hscale); + dev_dbg(&client->dev, "vscale is %04x, hscale is %04x\n", + vscale, hscale); /*write_regs(client, regs);*/ break; } @@ -287,12 +287,11 @@ static int wis_tw9903_probe(struct i2c_client *client, dec->hue = 0; i2c_set_clientdata(client, dec); - printk(KERN_DEBUG - "wis-tw9903: initializing TW9903 at address %d on %s\n", + dev_dbg(&client->dev, "initializing TW9903 at address %d on %s\n", client->addr, adapter->name); if (write_regs(client, initial_registers) < 0) { - printk(KERN_ERR "wis-tw9903: error initializing TW9903\n"); + dev_err(&client->dev, "error initializing TW9903\n"); kfree(dec); return -ENODEV; }