aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/usbvision/usbvision-core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/usb/usbvision/usbvision-core.c')
-rw-r--r--drivers/media/usb/usbvision/usbvision-core.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/media/usb/usbvision/usbvision-core.c b/drivers/media/usb/usbvision/usbvision-core.c
index 816b1cffab7d..302aa07c458f 100644
--- a/drivers/media/usb/usbvision/usbvision-core.c
+++ b/drivers/media/usb/usbvision/usbvision-core.c
@@ -1463,8 +1463,6 @@ static int usbvision_write_reg_irq(struct usb_usbvision *usbvision, int address,
1463 1463
1464static int usbvision_init_compression(struct usb_usbvision *usbvision) 1464static int usbvision_init_compression(struct usb_usbvision *usbvision)
1465{ 1465{
1466 int err_code = 0;
1467
1468 usbvision->last_isoc_frame_num = -1; 1466 usbvision->last_isoc_frame_num = -1;
1469 usbvision->isoc_data_count = 0; 1467 usbvision->isoc_data_count = 0;
1470 usbvision->isoc_packet_count = 0; 1468 usbvision->isoc_packet_count = 0;
@@ -1475,7 +1473,7 @@ static int usbvision_init_compression(struct usb_usbvision *usbvision)
1475 usbvision->request_intra = 1; 1473 usbvision->request_intra = 1;
1476 usbvision->isoc_measure_bandwidth_count = 0; 1474 usbvision->isoc_measure_bandwidth_count = 0;
1477 1475
1478 return err_code; 1476 return 0;
1479} 1477}
1480 1478
1481/* this function measures the used bandwidth since last call 1479/* this function measures the used bandwidth since last call
@@ -1484,11 +1482,9 @@ static int usbvision_init_compression(struct usb_usbvision *usbvision)
1484 */ 1482 */
1485static int usbvision_measure_bandwidth(struct usb_usbvision *usbvision) 1483static int usbvision_measure_bandwidth(struct usb_usbvision *usbvision)
1486{ 1484{
1487 int err_code = 0;
1488
1489 if (usbvision->isoc_measure_bandwidth_count < 2) { /* this gives an average bandwidth of 3 frames */ 1485 if (usbvision->isoc_measure_bandwidth_count < 2) { /* this gives an average bandwidth of 3 frames */
1490 usbvision->isoc_measure_bandwidth_count++; 1486 usbvision->isoc_measure_bandwidth_count++;
1491 return err_code; 1487 return 0;
1492 } 1488 }
1493 if ((usbvision->isoc_packet_size > 0) && (usbvision->isoc_packet_count > 0)) { 1489 if ((usbvision->isoc_packet_size > 0) && (usbvision->isoc_packet_count > 0)) {
1494 usbvision->used_bandwidth = usbvision->isoc_data_count / 1490 usbvision->used_bandwidth = usbvision->isoc_data_count /
@@ -1499,7 +1495,7 @@ static int usbvision_measure_bandwidth(struct usb_usbvision *usbvision)
1499 usbvision->isoc_data_count = 0; 1495 usbvision->isoc_data_count = 0;
1500 usbvision->isoc_packet_count = 0; 1496 usbvision->isoc_packet_count = 0;
1501 usbvision->isoc_skip_count = 0; 1497 usbvision->isoc_skip_count = 0;
1502 return err_code; 1498 return 0;
1503} 1499}
1504 1500
1505static int usbvision_adjust_compression(struct usb_usbvision *usbvision) 1501static int usbvision_adjust_compression(struct usb_usbvision *usbvision)
@@ -1546,26 +1542,24 @@ static int usbvision_adjust_compression(struct usb_usbvision *usbvision)
1546 1542
1547static int usbvision_request_intra(struct usb_usbvision *usbvision) 1543static int usbvision_request_intra(struct usb_usbvision *usbvision)
1548{ 1544{
1549 int err_code = 0;
1550 unsigned char buffer[1]; 1545 unsigned char buffer[1];
1551 1546
1552 PDEBUG(DBG_IRQ, ""); 1547 PDEBUG(DBG_IRQ, "");
1553 usbvision->request_intra = 1; 1548 usbvision->request_intra = 1;
1554 buffer[0] = 1; 1549 buffer[0] = 1;
1555 usbvision_write_reg_irq(usbvision, USBVISION_FORCE_INTRA, buffer, 1); 1550 usbvision_write_reg_irq(usbvision, USBVISION_FORCE_INTRA, buffer, 1);
1556 return err_code; 1551 return 0;
1557} 1552}
1558 1553
1559static int usbvision_unrequest_intra(struct usb_usbvision *usbvision) 1554static int usbvision_unrequest_intra(struct usb_usbvision *usbvision)
1560{ 1555{
1561 int err_code = 0;
1562 unsigned char buffer[1]; 1556 unsigned char buffer[1];
1563 1557
1564 PDEBUG(DBG_IRQ, ""); 1558 PDEBUG(DBG_IRQ, "");
1565 usbvision->request_intra = 0; 1559 usbvision->request_intra = 0;
1566 buffer[0] = 0; 1560 buffer[0] = 0;
1567 usbvision_write_reg_irq(usbvision, USBVISION_FORCE_INTRA, buffer, 1); 1561 usbvision_write_reg_irq(usbvision, USBVISION_FORCE_INTRA, buffer, 1);
1568 return err_code; 1562 return 0;
1569} 1563}
1570 1564
1571/******************************* 1565/*******************************