]> err.no Git - linux-2.6/commit
Fix a deadlock in the bttv driver
authorArjan van de Ven <arjan@linux.intel.com>
Tue, 20 May 2008 16:53:52 +0000 (09:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 17:12:26 +0000 (10:12 -0700)
commit81b2dbcad86732ffc02bad87aa25c4651199fc77
tree6c956c561fbaaa7e04ef612695bf5d3d0b5faef2
parentbabd90b274e6b43a7dc7bb08562bf566cbabdbf8
Fix a deadlock in the bttv driver

vidiocgmbuf() does this:
        mutex_lock(&fh->cap.vb_lock);
        retval = videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize,
                                     V4L2_MEMORY_MMAP);

and videobuf_mmap_setup() then just does
        mutex_lock(&q->vb_lock);
        ret = __videobuf_mmap_setup(q, bcount, bsize, memory);
        mutex_unlock(&q->vb_lock);

which is an obvious double-take deadlock.

This patch fixes this by having vidiocgmbuf() just call the
__videobuf_mmap_setup function instead.

Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Reported-by: Koos Vriezen <koos.vriezen@gmail.com>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/media/video/bt8xx/bttv-driver.c
drivers/media/video/videobuf-core.c
include/media/videobuf-core.h