Merge tag 'dm-3.5-changes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/agk...

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / nouveau_channel.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
index 9420538d2374b5170dec695022369148c5abbf04..629d8a2df5bd2d6214bdd663ad7bee450afaeb0e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_channel.c
+++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
@@ -355,7 +355,7 @@ nouveau_channel_ref(struct nouveau_channel *chan,
        *pchan = chan;
 }
 
-void
+int
 nouveau_channel_idle(struct nouveau_channel *chan)
 {
        struct drm_device *dev = chan->dev;
@@ -370,6 +370,7 @@ nouveau_channel_idle(struct nouveau_channel *chan)
 
        if (ret)
                NV_ERROR(dev, "Failed to idle channel %d.\n", chan->id);
+       return ret;
 }
 
 /* cleans up all the fifos from file_priv */