From 48e38ca36503c20c04ebe0549f972f3e4659cc2c Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Mon, 6 Aug 2012 22:47:06 -0300 Subject: [PATCH] --- yaml --- r: 330723 b: refs/heads/master c: baede40c4daf2157413ae218946d6fe3b3ed1292 h: refs/heads/master i: 330721: bb5dc6fa7031318dab7204d234b0b1614aa9bf50 330719: 9a548c672cd8f632079e72f6e4ffee1492e24505 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/au0828/au0828-i2c.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2c4b305e742b..26ec23863e0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ff63de690d74bec848caab64a86bd53c797365c +refs/heads/master: baede40c4daf2157413ae218946d6fe3b3ed1292 diff --git a/trunk/drivers/media/video/au0828/au0828-i2c.c b/trunk/drivers/media/video/au0828/au0828-i2c.c index d4545550e0dd..3bc76df5a47a 100644 --- a/trunk/drivers/media/video/au0828/au0828-i2c.c +++ b/trunk/drivers/media/video/au0828/au0828-i2c.c @@ -33,8 +33,8 @@ static int i2c_scan; module_param(i2c_scan, int, 0444); MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time"); -#define I2C_WAIT_DELAY 512 -#define I2C_WAIT_RETRY 64 +#define I2C_WAIT_DELAY 25 +#define I2C_WAIT_RETRY 1000 static inline int i2c_slave_did_write_ack(struct i2c_adapter *i2c_adap) {