From 0363405868eff82f48a4b275359637ff58ae63d6 Mon Sep 17 00:00:00 2001 From: Per Persson Date: Thu, 29 Sep 2011 10:32:18 +0200 Subject: video: hdmi: Fix fb creation failure This patch ensures that av8100 firmware download is completed before proceeding with commands that require fw. ST-Ericsson ID: 364550 ST-Ericsson Linux next: Not tested ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I0ee7005874bd43bfe1b557c05bdb12e2a9ebad1d Signed-off-by: Per Persson Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32469 Reviewed-by: Jimmy RUBIN --- drivers/video/av8100/hdmi.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/video/av8100/hdmi.c b/drivers/video/av8100/hdmi.c index 653cb5b2b23..0e06c648bed 100644 --- a/drivers/video/av8100/hdmi.c +++ b/drivers/video/av8100/hdmi.c @@ -260,7 +260,7 @@ static int edidread(struct hdmi_device *hdev, struct edid_read *edidread, } } - if (status.av8100_state < AV8100_OPMODE_INIT) { + if (status.av8100_state <= AV8100_OPMODE_INIT) { if (av8100_download_firmware(I2C_INTERFACE) != 0) { dev_err(hdev->dev, "av8100 dl fw FAIL\n"); return -EINVAL; @@ -307,7 +307,7 @@ static int cecread(struct hdmi_device *hdev, u8 *src, u8 *dest, u8 *data_len, } } - if (status.av8100_state < AV8100_OPMODE_INIT) { + if (status.av8100_state <= AV8100_OPMODE_INIT) { if (av8100_download_firmware(I2C_INTERFACE) != 0) { dev_err(hdev->dev, "av8100 dl fw FAIL\n"); return -EINVAL; @@ -378,7 +378,7 @@ static int cecsend(struct hdmi_device *hdev, u8 src, u8 dest, u8 data_len, } } - if (status.av8100_state < AV8100_OPMODE_INIT) { + if (status.av8100_state <= AV8100_OPMODE_INIT) { if (av8100_download_firmware(I2C_INTERFACE) != 0) { dev_err(hdev->dev, "av8100 dl fw FAIL\n"); return -EINVAL; @@ -433,7 +433,7 @@ static int infofrsend(struct hdmi_device *hdev, u8 type, u8 version, u8 crc, } } - if (status.av8100_state < AV8100_OPMODE_INIT) { + if (status.av8100_state <= AV8100_OPMODE_INIT) { if (av8100_download_firmware(I2C_INTERFACE) != 0) { dev_err(hdev->dev, "av8100 dl fw FAIL\n"); return -EINVAL; @@ -478,7 +478,7 @@ static int hdcpchkaesotp(struct hdmi_device *hdev, u8 *crc, u8 *progged) } } - if (status.av8100_state < AV8100_OPMODE_INIT) { + if (status.av8100_state <= AV8100_OPMODE_INIT) { if (av8100_download_firmware(I2C_INTERFACE) != 0) { dev_err(hdev->dev, "av8100 dl fw FAIL\n"); return -EINVAL; @@ -525,7 +525,7 @@ static int hdcpfuseaes(struct hdmi_device *hdev, u8 *key, u8 crc, u8 *result) } } - if (status.av8100_state < AV8100_OPMODE_INIT) { + if (status.av8100_state <= AV8100_OPMODE_INIT) { if (av8100_download_firmware(I2C_INTERFACE) != 0) { dev_err(hdev->dev, "av8100 dl fw FAIL\n"); return -EINVAL; @@ -579,7 +579,7 @@ static int hdcploadaes(struct hdmi_device *hdev, u8 block, u8 key_len, u8 *key, } } - if (status.av8100_state < AV8100_OPMODE_INIT) { + if (status.av8100_state <= AV8100_OPMODE_INIT) { if (av8100_download_firmware(I2C_INTERFACE) != 0) { dev_err(hdev->dev, "av8100 dl fw FAIL\n"); return -EINVAL; @@ -625,7 +625,7 @@ static int hdcpauthencr(struct hdmi_device *hdev, u8 auth_type, u8 encr_type, } } - if (status.av8100_state < AV8100_OPMODE_INIT) { + if (status.av8100_state <= AV8100_OPMODE_INIT) { if (av8100_download_firmware(I2C_INTERFACE) != 0) { dev_err(hdev->dev, "av8100 dl fw FAIL\n"); return -EINVAL; @@ -736,7 +736,7 @@ static int audiocfg(struct hdmi_device *hdev, struct audio_cfg *cfg) } } - if (status.av8100_state < AV8100_OPMODE_INIT) { + if (status.av8100_state <= AV8100_OPMODE_INIT) { if (av8100_download_firmware(I2C_INTERFACE) != 0) { dev_err(hdev->dev, "av8100 dl fw FAIL\n"); return -EINVAL; -- cgit v1.2.3