diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-09-13 10:58:13 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-13 10:58:13 -0700 |
| commit | 0dc637a1af2e72130c80fb69a6df4b5cfa23d486 (patch) | |
| tree | e7ab37cc37e88803130af050f97d6a78c454f8fa | |
| parent | 28525322acc8202290738588e5ec4c2df09ae7fc (diff) | |
| parent | 44d8abb6e009123c8535cf85157be4377a895049 (diff) | |
Merge "adv7481: return error when PLL lock fails"
| -rw-r--r-- | drivers/media/i2c/adv7481.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/media/i2c/adv7481.c b/drivers/media/i2c/adv7481.c index 7bf6a09fbc1c..4f3887c087ce 100644 --- a/drivers/media/i2c/adv7481.c +++ b/drivers/media/i2c/adv7481.c @@ -55,8 +55,6 @@ #define LOCK_MAX_SLEEP 6000 #define LOCK_NUM_TRIES 200 -#define MAX_DEFAULT_WIDTH 1280 -#define MAX_DEFAULT_HEIGHT 720 #define MAX_DEFAULT_FRAME_RATE 60 #define MAX_DEFAULT_PIX_CLK_HZ 74240000 @@ -1576,8 +1574,7 @@ static int adv7481_get_hdmi_timings(struct adv7481_state *state, } else { pr_err("%s(%d): PLL not locked return EBUSY\n", __func__, __LINE__); - ret = -EBUSY; - goto set_default; + return -EBUSY; } /* Check Timing Lock */ @@ -1697,17 +1694,6 @@ static int adv7481_get_hdmi_timings(struct adv7481_state *state, (hdmi_params->pix_rep + 1)); } -set_default: - if (ret) { - pr_debug("%s(%d), error %d resort to default fmt\n", - __func__, __LINE__, ret); - vid_params->act_pix = MAX_DEFAULT_WIDTH; - vid_params->act_lines = MAX_DEFAULT_HEIGHT; - vid_params->fr_rate = MAX_DEFAULT_FRAME_RATE; - vid_params->pix_clk = MAX_DEFAULT_PIX_CLK_HZ; - vid_params->intrlcd = 0; - ret = 0; - } pr_debug("%s(%d), adv7481 TMDS Resolution: %d x %d @ %d fps\n", __func__, __LINE__, |