From: Thierry Reding Date: Thu, 1 Sep 2011 05:43:04 +0000 (-0300) Subject: [media] tm6000: Enable fast USB quirk on Cinergy Hybrid X-Git-Tag: v3.2-rc1~112^2~117 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6e89648195eba51ae7f6de9104fdb2e0920b4aef;p=linux.git [media] tm6000: Enable fast USB quirk on Cinergy Hybrid The Cinergy Hybrid cards are known not to need an artificial delay after USB accesses so the quirk can safely be enabled. Signed-off-by: Thierry Reding Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c index 8483c562556e..ec2578a0fdf7 100644 --- a/drivers/staging/tm6000/tm6000-cards.c +++ b/drivers/staging/tm6000/tm6000-cards.c @@ -999,6 +999,16 @@ static int fill_board_specific_data(struct tm6000_core *dev) dev->vinput[2] = tm6000_boards[dev->model].vinput[2]; dev->rinput = tm6000_boards[dev->model].rinput; + /* setup per-model quirks */ + switch (dev->model) { + case TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE: + dev->quirks |= TM6000_QUIRK_NO_USB_DELAY; + break; + + default: + break; + } + /* initialize hardware */ rc = tm6000_init(dev); if (rc < 0)