diff --git a/[refs] b/[refs] index fdc1bf982b86..fe090dcb2917 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77f0773804ca49e3ed9075063ce7d954cafa49af +refs/heads/master: 76705fe8e1e173c9512a0fd638a1ed6356890b28 diff --git a/trunk/drivers/staging/media/go7007/wis-saa7113.c b/trunk/drivers/staging/media/go7007/wis-saa7113.c index 5c1c7c84f16e..8810c1e6e1ed 100644 --- a/trunk/drivers/staging/media/go7007/wis-saa7113.c +++ b/trunk/drivers/staging/media/go7007/wis-saa7113.c @@ -281,12 +281,12 @@ static int wis_saa7113_probe(struct i2c_client *client, dec->hue = 0; i2c_set_clientdata(client, dec); - printk(KERN_DEBUG + dev_dbg(&client->dev, "wis-saa7113: initializing SAA7113 at address %d on %s\n", client->addr, adapter->name); if (write_regs(client, initial_registers) < 0) { - printk(KERN_ERR + dev_err(&client->dev, "wis-saa7113: error initializing SAA7113\n"); kfree(dec); return -ENODEV;