diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-i2c.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-i2c.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c index d3322c3018f2..2ccfaba0c490 100644 --- a/drivers/media/video/saa7134/saa7134-i2c.c +++ b/drivers/media/video/saa7134/saa7134-i2c.c | |||
@@ -33,11 +33,11 @@ | |||
33 | 33 | ||
34 | /* ----------------------------------------------------------- */ | 34 | /* ----------------------------------------------------------- */ |
35 | 35 | ||
36 | static unsigned int i2c_debug = 0; | 36 | static unsigned int i2c_debug; |
37 | module_param(i2c_debug, int, 0644); | 37 | module_param(i2c_debug, int, 0644); |
38 | MODULE_PARM_DESC(i2c_debug,"enable debug messages [i2c]"); | 38 | MODULE_PARM_DESC(i2c_debug,"enable debug messages [i2c]"); |
39 | 39 | ||
40 | static unsigned int i2c_scan = 0; | 40 | static unsigned int i2c_scan; |
41 | module_param(i2c_scan, int, 0444); | 41 | module_param(i2c_scan, int, 0444); |
42 | MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time"); | 42 | MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time"); |
43 | 43 | ||
@@ -140,6 +140,8 @@ static inline int i2c_is_busy(enum i2c_status status) | |||
140 | { | 140 | { |
141 | switch (status) { | 141 | switch (status) { |
142 | case BUSY: | 142 | case BUSY: |
143 | case TO_SCL: | ||
144 | case TO_ARB: | ||
143 | return true; | 145 | return true; |
144 | default: | 146 | default: |
145 | return false; | 147 | return false; |