diff options
author | Olof Johansson <olof@lixom.net> | 2014-07-19 19:16:02 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-07-19 19:16:34 (GMT) |
commit | 730346236af3fcd3324dbc26e4fa13955c59fa7e (patch) | |
tree | 8bdc0ac70d36636a26e2284670aee5f15b930831 /drivers/gpu/drm/i915/i915_dma.c | |
parent | 1409f3fd5bdb548b0e11a109baa1087680b60c5a (diff) | |
parent | 8fe9346b945d76ddb3f08c00e34d701174c62fa0 (diff) | |
download | linux-730346236af3fcd3324dbc26e4fa13955c59fa7e.tar.xz |
Merge tag 'zynq-dt-for-3.17' of git://git.xilinx.com/linux-xlnx into next/dt
Merge "Xilinx Zynq changes for v3.17" from Michal Simek:
arm: Xilinx Zynq dt patches for v3.17
- Document and use new cadence serial binding
* tag 'zynq-dt-for-3.17' of git://git.xilinx.com/linux-xlnx:
ARM: zynq: DT: Migrate UART to Cadence binding
tty: cadence: Document DT binding
+ Linux 3.16-rc5
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 6c65639..d443441 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1464,12 +1464,13 @@ static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv) #else static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv) { - int ret; + int ret = 0; DRM_INFO("Replacing VGA console driver\n"); console_lock(); - ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); + if (con_is_bound(&vga_con)) + ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); if (ret == 0) { ret = do_unregister_con_driver(&vga_con); |