diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 19:14:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 19:14:02 -0400 |
| commit | 8e9d2089723d08d51e66c5eea49253d76e27941e (patch) | |
| tree | cf15609d5eeb0c1f3a39231d8ce793d3c8ad0ed0 /drivers/ieee1394 | |
| parent | ba1eb95cf3cc666769afe42eaa15a3a34ae82f94 (diff) | |
| parent | 60aa49243d09afc873f082567d2e3c16634ced84 (diff) | |
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
* 'bkl-removal' of git://git.lwn.net/linux-2.6:
Rationalize fasync return values
Move FASYNC bit handling to f_op->fasync()
Use f_lock to protect f_flags
Rename struct file->f_ep_lock
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/dv1394.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index 3838bc4acaba..cb15bfa38d70 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c | |||
| @@ -1325,11 +1325,7 @@ static int dv1394_fasync(int fd, struct file *file, int on) | |||
| 1325 | 1325 | ||
| 1326 | struct video_card *video = file_to_video_card(file); | 1326 | struct video_card *video = file_to_video_card(file); |
| 1327 | 1327 | ||
| 1328 | int retval = fasync_helper(fd, file, on, &video->fasync); | 1328 | return fasync_helper(fd, file, on, &video->fasync); |
| 1329 | |||
| 1330 | if (retval < 0) | ||
| 1331 | return retval; | ||
| 1332 | return 0; | ||
| 1333 | } | 1329 | } |
| 1334 | 1330 | ||
| 1335 | static ssize_t dv1394_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos) | 1331 | static ssize_t dv1394_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos) |