diff --git a/[refs] b/[refs] index 18f468547c42..cc894200e573 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e27ad0fe9cca5e6c98c3af6d7021690b6960adf8 +refs/heads/master: a581c72a8e9e9955714e8f3b62c46312bea3f6ba diff --git a/trunk/drivers/media/video/gspca/ov534_9.c b/trunk/drivers/media/video/gspca/ov534_9.c index e6601b886032..b5797308a39b 100644 --- a/trunk/drivers/media/video/gspca/ov534_9.c +++ b/trunk/drivers/media/video/gspca/ov534_9.c @@ -1376,7 +1376,7 @@ static int sd_init(struct gspca_dev *gspca_dev) ARRAY_SIZE(ov562x_init_2)); reg_w(gspca_dev, 0xe0, 0x00); } else { - err("Unknown sensor %04x", sensor_id); + pr_err("Unknown sensor %04x", sensor_id); return -EINVAL; }