Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357411
b: refs/heads/master
c: 4f4d14b
h: refs/heads/master
i:
  357409: 426eceb
  357407: cc9db11
v: v3
  • Loading branch information
Sylwester Nawrocki authored and Mauro Carvalho Chehab committed Feb 5, 2013
1 parent 3c00040 commit 6245baa
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2ccbe779bcdee130ea7f1525670dc9d60318a981
refs/heads/master: 4f4d14b70a29c679dd53e367b0d9b007a7117ee3
7 changes: 7 additions & 0 deletions trunk/drivers/media/v4l2-core/v4l2-event.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,3 +311,10 @@ int v4l2_event_unsubscribe(struct v4l2_fh *fh,
return 0;
}
EXPORT_SYMBOL_GPL(v4l2_event_unsubscribe);

int v4l2_event_subdev_unsubscribe(struct v4l2_subdev *sd, struct v4l2_fh *fh,
struct v4l2_event_subscription *sub)
{
return v4l2_event_unsubscribe(fh, sub);
}
EXPORT_SYMBOL_GPL(v4l2_event_subdev_unsubscribe);
4 changes: 3 additions & 1 deletion trunk/include/media/v4l2-event.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
*/

struct v4l2_fh;
struct v4l2_subdev;
struct v4l2_subscribed_event;
struct video_device;

Expand Down Expand Up @@ -129,5 +130,6 @@ int v4l2_event_subscribe(struct v4l2_fh *fh,
int v4l2_event_unsubscribe(struct v4l2_fh *fh,
const struct v4l2_event_subscription *sub);
void v4l2_event_unsubscribe_all(struct v4l2_fh *fh);

int v4l2_event_subdev_unsubscribe(struct v4l2_subdev *sd, struct v4l2_fh *fh,
struct v4l2_event_subscription *sub);
#endif /* V4L2_EVENT_H */

0 comments on commit 6245baa

Please sign in to comment.