Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 82997
b: refs/heads/master
c: 5a1c3e1
h: refs/heads/master
i:
  82995: 4057954
v: v3
  • Loading branch information
Julia Lawall authored and Linus Torvalds committed Feb 5, 2008
1 parent c3558ce commit fd98870
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 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: 4c1fc445c29c6208c44e10c0253beea890bf5435
refs/heads/master: 5a1c3e1aa977457ded6fd0739e032c9684bf23bd
6 changes: 5 additions & 1 deletion trunk/drivers/pcmcia/m8xx_pcmcia.c
Original file line number Diff line number Diff line change
Expand Up @@ -1174,8 +1174,10 @@ static int __init m8xx_probe(struct of_device *ofdev,

pcmcia_schlvl = irq_of_parse_and_map(np, 0);
hwirq = irq_map[pcmcia_schlvl].hwirq;
if (pcmcia_schlvl < 0)
if (pcmcia_schlvl < 0) {
iounmap(pcmcia);
return -EINVAL;
}

m8xx_pgcrx[0] = &pcmcia->pcmc_pgcra;
m8xx_pgcrx[1] = &pcmcia->pcmc_pgcrb;
Expand All @@ -1189,6 +1191,7 @@ static int __init m8xx_probe(struct of_device *ofdev,
driver_name, socket)) {
pcmcia_error("Cannot allocate IRQ %u for SCHLVL!\n",
pcmcia_schlvl);
iounmap(pcmcia);
return -1;
}

Expand Down Expand Up @@ -1284,6 +1287,7 @@ static int m8xx_remove(struct of_device *ofdev)
}
for (i = 0; i < PCMCIA_SOCKETS_NO; i++)
pcmcia_unregister_socket(&socket[i].socket);
iounmap(pcmcia);

free_irq(pcmcia_schlvl, NULL);

Expand Down

0 comments on commit fd98870

Please sign in to comment.