Merge tag 'v3.17-rc5' into usb-next

USB fixes in Linux 3.17-rc5 are needed to build on top of for 3.18.

Signed-off-by: Johan Hovold <johan@kernel.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index a2cc6be97983..b792194e0d9c 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -67,6 +67,7 @@ static int ast_detect_chip(struct drm_device *dev)
 {
         struct ast_private *ast = dev->dev_private;
         uint32_t data, jreg;
+        ast_open_key(ast);
 
         if (dev->pdev->device == PCI_CHIP_AST1180) {
                 ast->chip = AST1100;
@@ -104,7 +105,7 @@ static int ast_detect_chip(struct drm_device *dev)
                         }
                         ast->vga2_clone = false;
                 } else {
-                        ast->chip = 2000;
+                        ast->chip = AST2000;
                         DRM_INFO("AST 2000 detected\n");
                 }
         }