From 6438cd51b8d89235003f8ec41555b11df57ad0a7 Mon Sep 17 00:00:00 2001 From: Bee Hock Goh Date: Wed, 7 Apr 2010 20:57:19 -0300 Subject: [PATCH] --- yaml --- r: 192991 b: refs/heads/master c: c16dd82b4858b4a01ccce5c0a56ba58993802700 h: refs/heads/master i: 192989: aae4d9eff0e500eae6c41754e34bc80fd8e06f13 192987: a7c144e704b2c8497318bbd3470936ef67caffc3 192983: b67f1b744f8f35b7156b0d1058afa46911c054c6 192975: fe151751281ca23925660003b438db084922c97b 192959: e2e487506eb6bc150db77f1f1978a84fec4eefee v: v3 --- [refs] | 2 +- trunk/drivers/staging/tm6000/tm6000-video.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fd81a1be0aa1..39d089fc68e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d1f413e820c7e1402475eea254e2bc82d98de35 +refs/heads/master: c16dd82b4858b4a01ccce5c0a56ba58993802700 diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c index 67f4d2908c35..be6fcb79ef07 100644 --- a/trunk/drivers/staging/tm6000/tm6000-video.c +++ b/trunk/drivers/staging/tm6000/tm6000-video.c @@ -491,7 +491,7 @@ static inline int tm6000_isoc_copy(struct urb *urb) unsigned long copied; get_next_buf(dma_q, &buf); - if (!buf) + if (buf) outp = videobuf_to_vmalloc(&buf->vb); if (!outp)