提交 86e4754a 编写于 作者: J Julia Lawall 提交者: Benjamin Herrenschmidt

powerpc/pmac: Add missing unlocks in error path

In some error handling cases the lock is not unlocked.

A simplified version of the semantic patch that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
expression E1;
identifier f;
@@

f (...) { <+...
* spin_lock_irqsave (E1,...);
... when != E1
* return ...;
...+> }
// </smpl>
Signed-off-by: NJulia Lawall <julia@diku.dk>
Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
上级 f6d8c8bb
...@@ -155,6 +155,7 @@ static int macio_adb_reset_bus(void) ...@@ -155,6 +155,7 @@ static int macio_adb_reset_bus(void)
while ((in_8(&adb->ctrl.r) & ADB_RST) != 0) { while ((in_8(&adb->ctrl.r) & ADB_RST) != 0) {
if (--timeout == 0) { if (--timeout == 0) {
out_8(&adb->ctrl.r, in_8(&adb->ctrl.r) & ~ADB_RST); out_8(&adb->ctrl.r, in_8(&adb->ctrl.r) & ~ADB_RST);
spin_unlock_irqrestore(&macio_lock, flags);
return -1; return -1;
} }
} }
......
...@@ -1183,8 +1183,10 @@ static ssize_t smu_read_command(struct file *file, struct smu_private *pp, ...@@ -1183,8 +1183,10 @@ static ssize_t smu_read_command(struct file *file, struct smu_private *pp,
return -EOVERFLOW; return -EOVERFLOW;
spin_lock_irqsave(&pp->lock, flags); spin_lock_irqsave(&pp->lock, flags);
if (pp->cmd.status == 1) { if (pp->cmd.status == 1) {
if (file->f_flags & O_NONBLOCK) if (file->f_flags & O_NONBLOCK) {
spin_unlock_irqrestore(&pp->lock, flags);
return -EAGAIN; return -EAGAIN;
}
add_wait_queue(&pp->wait, &wait); add_wait_queue(&pp->wait, &wait);
for (;;) { for (;;) {
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册