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)