From 3bb67d2ba7aca23fcf73b68ce70a932128575c42 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 28 Oct 2011 22:10:15 +1000 Subject: [PATCH] --- yaml --- r: 282602 b: refs/heads/master c: 19fa224f8a91a73a39b35251ced04b59b2a171b4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_pm.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b65d53882b99..d6284926cbfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b627a0b23404d97d1720c0c1abaee602aee9518 +refs/heads/master: 19fa224f8a91a73a39b35251ced04b59b2a171b4 diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_pm.c b/trunk/drivers/gpu/drm/nouveau/nv50_pm.c index bf9fd95c81c0..53b6c6c75744 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv50_pm.c +++ b/trunk/drivers/gpu/drm/nouveau/nv50_pm.c @@ -619,6 +619,7 @@ nv50_pm_clocks_set(struct drm_device *dev, void *data) ret = -EBUSY; resume: nv_mask(dev, 0x002504, 0x00000001, 0x00000000); + kfree(info); return ret; }