Skip to contentSkip to conversation

fb_ddc: Allow I2C adapters without SCL read capability

PATCH Krzysztof Helt 1 participant 1 message Feb 11, 2015 Framebuffer layer

lore
Share & tools
lore

Krzysztof Helt

author Acked-by
#0 lore raw

Dnia Sobota, 7 Lutego 2015 21:53 Ondrej Zary <[email protected]> napisa³(a)

Quoted 40 lines

i2c-algo-bit allows I2C adapters without SCL read capability to work but fb_ddc_read fails to work on them.

Fix fb_ddc_read to work with I2C adapters not capable of reading SCL.

---
 drivers/video/fbdev/core/fb_ddc.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/video/fbdev/core/fb_ddc.c +5 -3
index 94322cc..22c694a 100644
@@ -69,10 +69,11 @@ unsigned char *fb_ddc_read(struct i2c_adapter *adapter)
 		algo_data->setscl(algo_data->data, 1);
 		for (j = 0; j < 5; j++) {
 			msleep(10);
-			if (algo_data->getscl(algo_data->data))
+			if (algo_data->getscl &&
+			    algo_data->getscl(algo_data->data))
 				break;
 		}
-		if (j = 5)
+		if (algo_data->getscl && j = 5)
 			continue;
 
 		algo_data->setsda(algo_data->data, 0);
@@ -91,7 +92,8 @@ unsigned char *fb_ddc_read(struct i2c_adapter *adapter)
 		algo_data->setscl(algo_data->data, 1);
 		for (j = 0; j < 10; j++) {
 			msleep(10);
-			if (algo_data->getscl(algo_data->data))
+			if (algo_data->getscl &&
+			    algo_data->getscl(algo_data->data))
 				break;
 		}
 
Signature · 1 line
Ondrej Zary