diff --git a/[refs] b/[refs]
index a8973ec30e03..511709fa9a41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad84291c6af11e07d8c55eb4ea4d64ade054e2a5
+refs/heads/master: dc03398528c83357e1e95481cd447f6bf1036b76
diff --git a/trunk/drivers/media/platform/s5p-tv/mixer_drv.c b/trunk/drivers/media/platform/s5p-tv/mixer_drv.c
index c1b2e0ed20d2..d5cf603551b2 100644
--- a/trunk/drivers/media/platform/s5p-tv/mixer_drv.c
+++ b/trunk/drivers/media/platform/s5p-tv/mixer_drv.c
@@ -298,7 +298,7 @@ static void mxr_release_resources(struct mxr_device *mdev)
 {
 	mxr_release_clocks(mdev);
 	mxr_release_plat_resources(mdev);
-	memset(&mdev->res, 0, sizeof mdev->res);
+	memset(&mdev->res, 0, sizeof(mdev->res));
 }
 
 static void mxr_release_layers(struct mxr_device *mdev)
@@ -382,7 +382,7 @@ static int __devinit mxr_probe(struct platform_device *pdev)
 	/* mdev does not exist yet so no mxr_dbg is used */
 	dev_info(dev, "probe start\n");
 
-	mdev = kzalloc(sizeof *mdev, GFP_KERNEL);
+	mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
 	if (!mdev) {
 		dev_err(dev, "not enough memory.\n");
 		ret = -ENOMEM;