Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285249
b: refs/heads/master
c: 1ff1d88
h: refs/heads/master
i:
  285247: ddeca82
v: v3
  • Loading branch information
Ben Hutchings authored and Mauro Carvalho Chehab committed Nov 24, 2011
1 parent 9151542 commit 9e30895
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c8e57e1b766c2321aa76ee5e6878c69bd2313d62
refs/heads/master: 1ff1d88e862948ae5bfe490248c023ff8ac2855d
4 changes: 1 addition & 3 deletions trunk/drivers/staging/media/lirc/lirc_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -1127,10 +1127,8 @@ static int lirc_serial_resume(struct platform_device *dev)
{
unsigned long flags;

if (hardware_init_port() < 0) {
lirc_serial_exit();
if (hardware_init_port() < 0)
return -EINVAL;
}

spin_lock_irqsave(&hardware[type].lock, flags);
/* Enable Interrupt */
Expand Down

0 comments on commit 9e30895

Please sign in to comment.