summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx/em28xx-dvb.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-05-27 09:13:15 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-05-27 09:13:15 -0300
commitf6495a8c62646591f7785527b923544dfddc7019 (patch)
tree297ca776a6d5b8c8ded83c29d491af6ef3e5295a /linux/drivers/media/video/em28xx/em28xx-dvb.c
parentff417333f92b9ebf9523167136785d69bb73fab6 (diff)
parent8e9cc981e8c7b756ee8da597dbd9861e86f53cbf (diff)
downloadmediapointer-dvb-s2-f6495a8c62646591f7785527b923544dfddc7019.tar.gz
mediapointer-dvb-s2-f6495a8c62646591f7785527b923544dfddc7019.tar.bz2
merge: http://kernellabs.com/hg/~stoth/tda10048-merge
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-dvb.c')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-dvb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-dvb.c b/linux/drivers/media/video/em28xx/em28xx-dvb.c
index dd749442d..de919504f 100644
--- a/linux/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/linux/drivers/media/video/em28xx/em28xx-dvb.c
@@ -47,7 +47,6 @@ if (debug >= level) \
} while (0)
#define EM28XX_DVB_NUM_BUFS 5
-#define EM28XX_DVB_MAX_PACKETSIZE 564
#define EM28XX_DVB_MAX_PACKETS 64
struct em28xx_dvb {
@@ -143,14 +142,17 @@ static int start_streaming(struct em28xx_dvb *dvb)
{
int rc;
struct em28xx *dev = dvb->adapter.priv;
+ int max_dvb_packet_size;
usb_set_interface(dev->udev, 0, 1);
rc = em28xx_set_mode(dev, EM28XX_DIGITAL_MODE);
if (rc < 0)
return rc;
+ max_dvb_packet_size = em28xx_isoc_dvb_max_packetsize(dev);
+
return em28xx_init_isoc(dev, EM28XX_DVB_MAX_PACKETS,
- EM28XX_DVB_NUM_BUFS, EM28XX_DVB_MAX_PACKETSIZE,
+ EM28XX_DVB_NUM_BUFS, max_dvb_packet_size,
dvb_isoc_copy);
}