diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-20 16:53:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-20 16:53:16 -0500 |
| commit | 198d2f63a6096fe575b696b13ba61b62c620266f (patch) | |
| tree | d0c2b0697370cc670029cd1eb2a80c35c71eac60 /drivers/gpu/drm/nouveau/nouveau_object.c | |
| parent | 0da2b300b91ddeb9944c3fb4faaf78c1c482c0af (diff) | |
| parent | 1f474646fdc36b457606bbcd6a3592e6cbd31ac4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_object.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_object.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c index 6c2cf81716df..e7c100ba63a1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_object.c +++ b/drivers/gpu/drm/nouveau/nouveau_object.c | |||
| @@ -885,11 +885,12 @@ int | |||
| 885 | nouveau_gpuobj_sw_new(struct nouveau_channel *chan, int class, | 885 | nouveau_gpuobj_sw_new(struct nouveau_channel *chan, int class, |
| 886 | struct nouveau_gpuobj **gpuobj_ret) | 886 | struct nouveau_gpuobj **gpuobj_ret) |
| 887 | { | 887 | { |
| 888 | struct drm_nouveau_private *dev_priv = chan->dev->dev_private; | 888 | struct drm_nouveau_private *dev_priv; |
| 889 | struct nouveau_gpuobj *gpuobj; | 889 | struct nouveau_gpuobj *gpuobj; |
| 890 | 890 | ||
| 891 | if (!chan || !gpuobj_ret || *gpuobj_ret != NULL) | 891 | if (!chan || !gpuobj_ret || *gpuobj_ret != NULL) |
| 892 | return -EINVAL; | 892 | return -EINVAL; |
| 893 | dev_priv = chan->dev->dev_private; | ||
| 893 | 894 | ||
| 894 | gpuobj = kzalloc(sizeof(*gpuobj), GFP_KERNEL); | 895 | gpuobj = kzalloc(sizeof(*gpuobj), GFP_KERNEL); |
| 895 | if (!gpuobj) | 896 | if (!gpuobj) |