leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/pwr: fix missing mutex unlock in a failure path

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2013-11-14 08:31:26 +10:00
parent 09dacc7bb0
commit 35c336707f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/nouveau/core/subdev/pwr/base.c
View File

@ -32,6 +32,11 @@ nouveau_pwr_send(struct nouveau_pwr *ppwr, u32 reply[2],
struct nouveau_subdev *subdev = nv_subdev(ppwr); struct nouveau_subdev *subdev = nv_subdev(ppwr);
u32 addr; u32 addr;
/* wait for a free slot in the fifo */
addr = nv_rd32(ppwr, 0x10a4a0);
if (!nv_wait_ne(ppwr, 0x10a4b0, 0xffffffff, addr ^ 8))
return -EBUSY;
/* we currently only support a single process at a time waiting /* we currently only support a single process at a time waiting
* on a synchronous reply, take the PPWR mutex and tell the * on a synchronous reply, take the PPWR mutex and tell the
* receive handler what we're waiting for * receive handler what we're waiting for
@ -42,11 +47,6 @@ nouveau_pwr_send(struct nouveau_pwr *ppwr, u32 reply[2],
ppwr->recv.process = process; ppwr->recv.process = process;
} }
/* wait for a free slot in the fifo */
addr = nv_rd32(ppwr, 0x10a4a0);
if (!nv_wait_ne(ppwr, 0x10a4b0, 0xffffffff, addr ^ 8))
return -EBUSY;
/* acquire data segment access */ /* acquire data segment access */
do { do {
nv_wr32(ppwr, 0x10a580, 0x00000001); nv_wr32(ppwr, 0x10a580, 0x00000001);