diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-01 19:51:52 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-01 19:51:52 +0900 |
| commit | 6cf3c736200e3924d8ce6b37e5006a4598b9236d (patch) | |
| tree | 9560341b063c1a10e62201c84141af0d63396b61 /drivers/media/pci/zoran/zoran.h | |
| parent | f8cb27916ae256ef3b4e2ecca7262109dcfdd083 (diff) | |
| parent | 4ad1f70ebcdb69393ce083f514bf4a4a3a3e65cb (diff) | |
| download | lwn-6cf3c736200e3924d8ce6b37e5006a4598b9236d.tar.gz lwn-6cf3c736200e3924d8ce6b37e5006a4598b9236d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull assorted fixes from Al Viro:
"There'll be more - I'm trying to dig out from under the pile of mail
(a couple of weeks of something flu-like ;-/) and there's several more
things waiting for review; this is just the obvious stuff."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
zoran: racy refcount handling in vm_ops ->open()/->close()
befs_readdir(): do not increment ->f_pos if filldir tells us to stop
hpfs: deadlock and race in directory lseek()
qnx6: qnx6_readdir() has a braino in pos calculation
fix buffer leak after "scsi: saner replacements for ->proc_info()"
vfs: Fix invalid ida_remove() call
Diffstat (limited to 'drivers/media/pci/zoran/zoran.h')
| -rw-r--r-- | drivers/media/pci/zoran/zoran.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/zoran/zoran.h b/drivers/media/pci/zoran/zoran.h index ca2754a3cd63..5e040085c2ff 100644 --- a/drivers/media/pci/zoran/zoran.h +++ b/drivers/media/pci/zoran/zoran.h @@ -176,7 +176,7 @@ struct zoran_fh; struct zoran_mapping { struct zoran_fh *fh; - int count; + atomic_t count; }; struct zoran_buffer { |