summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-05-02 16:21:03 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-06-01 09:42:03 -0300
commit6e3ea0e711b1c4dca3c4f87ef0ab5c896c940c81 (patch)
tree88765aa85befb786fc2b59ce914ede7606aa38a0 /include/media
parentc5874c9245d298c65f81c2f91f89e1da8ea66409 (diff)
downloadlinux-6e3ea0e711b1c4dca3c4f87ef0ab5c896c940c81.tar.bz2
[media] v4l: Fix media_entity_to_video_device macro argument name
The name 'entity' is used twice in the macro body, once as the macro argument, and once as a structure field name. This breaks compilation if the macro is called with its argument not named 'entity'. Fix this by renaming the macro argument '__e'. This should avoid namespace clashes. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-dev.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 93e96fb93452..c7c40f1d2624 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -128,8 +128,8 @@ struct video_device
struct mutex *lock;
};
-#define media_entity_to_video_device(entity) \
- container_of(entity, struct video_device, entity)
+#define media_entity_to_video_device(__e) \
+ container_of(__e, struct video_device, entity)
/* dev to video-device */
#define to_video_device(cd) container_of(cd, struct video_device, dev)