From e574d632b7cb5b3e4f236269e894747d7ed8ee54 Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Mon, 5 Nov 2012 07:36:26 -0300 Subject: [PATCH] --- yaml --- r: 343912 b: refs/heads/master c: f0e3393031238e7fc38a34cdb0bd2331bbcc9e11 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/go7007/wis-saa7115.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e4f739d001e5..f42a2ca072a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11f1c44d19dd79e707bec92660d7b3518bbb1850 +refs/heads/master: f0e3393031238e7fc38a34cdb0bd2331bbcc9e11 diff --git a/trunk/drivers/staging/media/go7007/wis-saa7115.c b/trunk/drivers/staging/media/go7007/wis-saa7115.c index a178b41c0a05..fa86acd3fdf0 100644 --- a/trunk/drivers/staging/media/go7007/wis-saa7115.c +++ b/trunk/drivers/staging/media/go7007/wis-saa7115.c @@ -414,12 +414,12 @@ static int wis_saa7115_probe(struct i2c_client *client, dec->hue = 0; i2c_set_clientdata(client, dec); - printk(KERN_DEBUG + dev_dbg(&client->dev, "wis-saa7115: initializing SAA7115 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-saa7115: error initializing SAA7115\n"); kfree(dec); return -ENODEV;