diff --git a/[refs] b/[refs]
index 5d5448a00733..3a101015f977 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94c15b5e6755711af6dd81bde0f8396e24b75dc2
+refs/heads/master: 970e85f87067638262a5c165aff404e6190817f8
diff --git a/trunk/drivers/media/platform/s5p-tv/mixer_drv.c b/trunk/drivers/media/platform/s5p-tv/mixer_drv.c
index a15ca0595b87..ca0f29717448 100644
--- a/trunk/drivers/media/platform/s5p-tv/mixer_drv.c
+++ b/trunk/drivers/media/platform/s5p-tv/mixer_drv.c
@@ -384,7 +384,7 @@ static int __devinit mxr_probe(struct platform_device *pdev)
 
 	mdev = kzalloc(sizeof *mdev, GFP_KERNEL);
 	if (!mdev) {
-		mxr_err(mdev, "not enough memory.\n");
+		dev_err(dev, "not enough memory.\n");
 		ret = -ENOMEM;
 		goto fail;
 	}