| 2351,7 → 2351,7 |
|---|
| buf = (struct bttv_buffer *)fh->cap.bufs[vm->frame]; |
| if (NULL == buf) |
| goto fh_unlock_and_return; |
| |
| |
| if (0 == buf->vb.baddr) |
| goto fh_unlock_and_return; |
| |
| 3155,13 → 3155,13 |
|---|
| |
| memset(set,0,sizeof(*set)); |
| |
| /* vbi request ? */ |
| set->irqflags = 1; |
| /* |
| if (!list_empty(&btv->vcapture)) { |
| set->irqflags = 1; |
| set->vbi = list_entry(btv->vcapture.next, struct bttv_buffer, vb.queue); |
| } |
| |
| /* capture request ? */ |
| if (!list_empty(&btv->capture)) { |
| set->irqflags = 1; |
| item = list_entry(btv->capture.next, struct bttv_buffer, vb.queue); |
| 3170,7 → 3170,6 |
|---|
| if (V4L2_FIELD_HAS_BOTTOM(item->vb.field)) |
| set->bottom = item; |
| |
| /* capture request for other field ? */ |
| if (!V4L2_FIELD_HAS_BOTH(item->vb.field) && |
| (item->vb.queue.next != &btv->capture)) { |
| item = list_entry(item->vb.queue.next, struct bttv_buffer, vb.queue); |
| 3189,7 → 3188,6 |
|---|
| } |
| } |
| |
| /* screen overlay ? */ |
| if (NULL != btv->screen) { |
| if (V4L2_FIELD_HAS_BOTH(btv->screen->vb.field)) { |
| if (NULL == set->top && NULL == set->bottom) { |
| 3207,7 → 3205,7 |
|---|
| } |
| } |
| } |
| |
| */ |
| dprintk("bttv%d: next set: top=%p bottom=%p vbi=%p " |
| "[screen=%p,irq=%d,%d]\n", |
| btv->nr,set->top, set->bottom, set->vbi, |