From dbe81df922ade151e9883f9ee1da8c3e16251ffa Mon Sep 17 00:00:00 2001
From: Sakari Ailus <sakari.ailus@iki.fi>
Date: Wed, 15 Feb 2012 22:58:12 -0300
Subject: [PATCH] --- yaml --- r: 306126 b: refs/heads/master c:
 c5a766ceb497078459115fcbd1412917083aa4a5 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/include/media/v4l2-subdev.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 71f411ab5bfc..74cedc5653a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae184cda8d0eebfea6cf217abc3f94a7cfffe24d
+refs/heads/master: c5a766ceb497078459115fcbd1412917083aa4a5
diff --git a/trunk/include/media/v4l2-subdev.h b/trunk/include/media/v4l2-subdev.h
index feab950bc8ab..bcaf6b80bb20 100644
--- a/trunk/include/media/v4l2-subdev.h
+++ b/trunk/include/media/v4l2-subdev.h
@@ -545,7 +545,7 @@ struct v4l2_subdev {
 #define media_entity_to_v4l2_subdev(ent) \
 	container_of(ent, struct v4l2_subdev, entity)
 #define vdev_to_v4l2_subdev(vdev) \
-	video_get_drvdata(vdev)
+	((struct v4l2_subdev *)video_get_drvdata(vdev))
 
 /*
  * Used for storing subdev information per file handle