Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 23601
b: refs/heads/master
c: 656bde5
h: refs/heads/master
i:
  23599: afe2333
v: v3
  • Loading branch information
Jesper Juhl authored and Linus Torvalds committed Mar 25, 2006
1 parent 8bbc843 commit c8cae5f
Show file tree
Hide file tree
Showing 2 changed files with 4 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: bda44e1d168ac76fce5183eb141592fc645c7818
refs/heads/master: 656bde5728b824ca23fcab8bc5800b309ea48d64
4 changes: 3 additions & 1 deletion trunk/drivers/pnp/isapnp/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -646,8 +646,10 @@ static int __init isapnp_create_device(struct pnp_card *card,
size = 0;
skip = 0;
option = pnp_register_independent_option(dev);
if (!option)
if (!option) {
kfree(dev);
return 1;
}
pnp_add_card_device(card,dev);
} else {
skip = 1;
Expand Down

0 comments on commit c8cae5f

Please sign in to comment.