diff --git a/[refs] b/[refs]
index 5a8a712db7c1..7bb3c6d6c5b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9064cb5e03b1502782d314b03ea3cbe09992f9a7
+refs/heads/master: e169c9baa31b23d8e0641359772c47291c485c14
diff --git a/trunk/drivers/media/i2c/m5mols/m5mols.h b/trunk/drivers/media/i2c/m5mols/m5mols.h
index bb589917b65b..527e7b2965df 100644
--- a/trunk/drivers/media/i2c/m5mols/m5mols.h
+++ b/trunk/drivers/media/i2c/m5mols/m5mols.h
@@ -323,12 +323,12 @@ static inline struct v4l2_subdev *to_sd(struct v4l2_ctrl *ctrl)
 static inline void m5mols_set_ctrl_mode(struct v4l2_ctrl *ctrl,
 					unsigned int mode)
 {
-	ctrl->priv = (void *)mode;
+	ctrl->priv = (void *)(uintptr_t)mode;
 }
 
 static inline unsigned int m5mols_get_ctrl_mode(struct v4l2_ctrl *ctrl)
 {
-	return (unsigned int)ctrl->priv;
+	return (unsigned int)(uintptr_t)ctrl->priv;
 }
 
 #endif	/* M5MOLS_H */
diff --git a/trunk/drivers/media/i2c/m5mols/m5mols_controls.c b/trunk/drivers/media/i2c/m5mols/m5mols_controls.c
index fdbc205a2969..f34429e452ab 100644
--- a/trunk/drivers/media/i2c/m5mols/m5mols_controls.c
+++ b/trunk/drivers/media/i2c/m5mols/m5mols_controls.c
@@ -463,8 +463,8 @@ static int m5mols_s_ctrl(struct v4l2_ctrl *ctrl)
 		return 0;
 	}
 
-	v4l2_dbg(1, m5mols_debug, sd, "%s: %s, val: %d, priv: %#x\n",
-		 __func__, ctrl->name, ctrl->val, (int)ctrl->priv);
+	v4l2_dbg(1, m5mols_debug, sd, "%s: %s, val: %d, priv: %p\n",
+		 __func__, ctrl->name, ctrl->val, ctrl->priv);
 
 	if (ctrl_mode && ctrl_mode != info->mode) {
 		ret = m5mols_set_mode(info, ctrl_mode);