diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-01-14 08:15:36 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-01-14 08:15:36 +1000 |
| commit | 94bc70a8e7ed734c201a4d7b0607619372f4b724 (patch) | |
| tree | f8c0b8ca95364492efc826281bc8fa0846d1fa50 /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | 82ba789f48de669fd0bbc84c326f07571d078572 (diff) | |
| parent | 43f789792e2c7ea2bff37195e4c4b4239e9e02b7 (diff) | |
| download | blackbird-op-linux-94bc70a8e7ed734c201a4d7b0607619372f4b724.tar.gz blackbird-op-linux-94bc70a8e7ed734c201a4d7b0607619372f4b724.zip | |
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
Regression fixes since rework mostly.
* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nvc0/fb: fix crash when different mutex is used to protect same list
drm/nouveau/clock: fix support for more than 2 monitors on nve0
drm/nv50/disp: fix selection of bios script for analog outputs
drm/nv17-50: restore fence buffer on resume
drm/nouveau: fix blank LVDS screen regression on pre-nv50 cards
drm/nouveau: fix nouveau_client allocation failure path
drm/nouveau: don't return freed object from nouveau_handle_create
drm/nouveau/vm: fix memory corruption when pgt allocation fails
drm/nouveau: add locking around instobj list operations
drm/nouveau: do not forcibly power on lvds panels
drm/nouveau/devinit: ensure legacy vga control is enabled during post
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 180a45e3b525..8b090f1eb51d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -84,11 +84,16 @@ nouveau_cli_create(struct pci_dev *pdev, const char *name, struct nouveau_cli *cli; int ret; + *pcli = NULL; ret = nouveau_client_create_(name, nouveau_name(pdev), nouveau_config, nouveau_debug, size, pcli); cli = *pcli; - if (ret) + if (ret) { + if (cli) + nouveau_client_destroy(&cli->base); + *pcli = NULL; return ret; + } mutex_init(&cli->mutex); return 0; |
