diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-06-12 08:57:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-06-12 08:57:41 +0800 |
| commit | a992366b8fecfb9b4169befeb6489703a4e2f477 (patch) | |
| tree | 19c73dc3c21d928af0bbe7b694be2097da4c88b4 /drivers/gpu/drm/nouveau/core | |
| parent | 9dd891c311f5ded8c718120c87c982cade5d2479 (diff) | |
| parent | fce5b5fc495819be9eef7d4d41a9659b2968c7ea (diff) | |
Merge tag 'v3.14.7' into linux-linaro-lsk-v3.14
This is the 3.14.7 stable release
Diffstat (limited to 'drivers/gpu/drm/nouveau/core')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c index 1c5e4e8b2c82..e031d7c88fa3 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c @@ -732,7 +732,7 @@ exec_clkcmp(struct nv50_disp_priv *priv, int head, int id, } if (outp == 8) - return false; + return conf; data = exec_lookup(priv, head, outp, ctrl, dcb, &ver, &hdr, &cnt, &len, &info1); if (data == 0x0000) |