Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932102AbbBGUxv (ORCPT ); Sat, 7 Feb 2015 15:53:51 -0500 Received: from ns.gsystem.sk ([62.176.172.50]:35085 "EHLO gsystem.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755747AbbBGUxt (ORCPT ); Sat, 7 Feb 2015 15:53:49 -0500 From: Ondrej Zary To: Krzysztof Helt Cc: linux-fbdev@vger.kernel.org, Kernel development list Subject: [PATCH 3/4] fb_ddc: Allow I2C adapters without SCL read capability Date: Sat, 7 Feb 2015 21:53:36 +0100 Message-Id: <1423342417-26069-3-git-send-email-linux@rainbow-software.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1423342417-26069-1-git-send-email-linux@rainbow-software.org> References: <1423342417-26069-1-git-send-email-linux@rainbow-software.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1500 Lines: 46 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. Signed-off-by: Ondrej Zary --- drivers/video/fbdev/core/fb_ddc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/core/fb_ddc.c b/drivers/video/fbdev/core/fb_ddc.c index 94322cc..22c694a 100644 --- a/drivers/video/fbdev/core/fb_ddc.c +++ b/drivers/video/fbdev/core/fb_ddc.c @@ -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; } -- Ondrej Zary -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/