diff --git a/[refs] b/[refs] index 8519cbf8e80f..09e23c64c85d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56ed221f099afe5c234e5c2cd1371acc8ddbcd88 +refs/heads/master: 26fdcf0980225f8b3d5fa258d9f41433cb0664ed diff --git a/trunk/drivers/media/platform/mem2mem_testdev.c b/trunk/drivers/media/platform/mem2mem_testdev.c index 8b27a7e2a09a..7627335816e4 100644 --- a/trunk/drivers/media/platform/mem2mem_testdev.c +++ b/trunk/drivers/media/platform/mem2mem_testdev.c @@ -397,8 +397,7 @@ static void device_isr(unsigned long priv) curr_ctx = v4l2_m2m_get_curr_priv(m2mtest_dev->m2m_dev); if (NULL == curr_ctx) { - printk(KERN_ERR - "Instance released before the end of transaction\n"); + pr_err("Instance released before the end of transaction\n"); return; }