Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm...

[linux-beck.git] / drivers / gpu / drm / vmwgfx / vmwgfx_context.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
index 7ef77640028d7234ecc534a69540454ed12f6152..443d1ed00de7856a2998920e9e00ca6bf8a4902c 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
@@ -190,7 +190,7 @@ static int vmw_gb_context_init(struct vmw_private *dev_priv,
 
        if (dev_priv->has_mob) {
                uctx->man = vmw_cmdbuf_res_man_create(dev_priv);
-               if (unlikely(IS_ERR(uctx->man))) {
+               if (IS_ERR(uctx->man)) {
                        ret = PTR_ERR(uctx->man);
                        uctx->man = NULL;
                        goto out_err;