diff options
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c index f6721f0ea..e691f6036 100644 --- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c +++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c @@ -86,7 +86,7 @@ static void dvb_usb_bulk_urb_complete(struct urb *urb, struct pt_regs *ptregs) } if (d->feedcount > 0 && urb->actual_length > 0) { - if (d->init_state & DVB_USB_STATE_DVB) + if (d->state & DVB_USB_STATE_DVB) dvb_dmx_swfilter(&d->demux, (u8*) urb->transfer_buffer,urb->actual_length); } else deb_ts("URB dropped because of feedcount.\n"); @@ -135,7 +135,7 @@ static int dvb_usb_bulk_urb_init(struct dvb_usb_device *d) deb_info("allocation successful\n"); memset(d->buffer,0,bufsize); - d->init_state |= DVB_USB_STATE_URB_BUF; + d->state |= DVB_USB_STATE_URB_BUF; /* allocate the URBs */ for (i = 0; i < d->props.urb.count; i++) { @@ -172,7 +172,7 @@ int dvb_usb_urb_init(struct dvb_usb_device *d) if (d->urb_list == NULL) return -ENOMEM; memset(d->urb_list,0,d->props.urb.count * sizeof(struct urb *)); - d->init_state |= DVB_USB_STATE_URB_LIST; + d->state |= DVB_USB_STATE_URB_LIST; switch (d->props.urb.type) { case DVB_USB_BULK: @@ -192,7 +192,7 @@ int dvb_usb_urb_exit(struct dvb_usb_device *d) dvb_usb_urb_kill(d); - if (d->init_state & DVB_USB_STATE_URB_LIST) { + if (d->state & DVB_USB_STATE_URB_LIST) { for (i = 0; i < d->urbs_initialized; i++) { if (d->urb_list[i] != NULL) { deb_info("freeing URB no. %d.\n",i); @@ -203,14 +203,14 @@ int dvb_usb_urb_exit(struct dvb_usb_device *d) d->urbs_initialized = 0; /* free the urb array */ kfree(d->urb_list); - d->init_state &= ~DVB_USB_STATE_URB_LIST; + d->state &= ~DVB_USB_STATE_URB_LIST; } - if (d->init_state & DVB_USB_STATE_URB_BUF) + if (d->state & DVB_USB_STATE_URB_BUF) pci_free_consistent(NULL, d->props.urb.u.bulk.buffersize * d->props.urb.count, d->buffer,d->dma_handle); - d->init_state &= ~DVB_USB_STATE_URB_BUF; + d->state &= ~DVB_USB_STATE_URB_BUF; return 0; } |