Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw

Conflicts:
	drivers/spi/spi-dw-mid.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index 9c5221ce391a..ab5bfd2d0ebf 100644
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -143,7 +143,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
         ret = msm_gem_get_iova_locked(fbdev->bo, 0, &paddr);
         if (ret) {
                 dev_err(dev->dev, "failed to get buffer obj iova: %d\n", ret);
-                goto fail;
+                goto fail_unlock;
         }
 
         fbi = framebuffer_alloc(0, dev->dev);