diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /sound/isa/gus | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/isa/gus')
| -rw-r--r-- | sound/isa/gus/interwave.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c index f12cd09d1fcc..4ec2d79431fc 100644 --- a/sound/isa/gus/interwave.c +++ b/sound/isa/gus/interwave.c | |||
| @@ -564,6 +564,8 @@ static int __devinit snd_interwave_pnp(int dev, struct snd_interwave *iwcard, | |||
| 564 | struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL); | 564 | struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL); |
| 565 | int err; | 565 | int err; |
| 566 | 566 | ||
| 567 | if (!cfg) | ||
| 568 | return -ENOMEM; | ||
| 567 | iwcard->dev = pnp_request_card_device(card, id->devs[0].id, NULL); | 569 | iwcard->dev = pnp_request_card_device(card, id->devs[0].id, NULL); |
| 568 | if (iwcard->dev == NULL) { | 570 | if (iwcard->dev == NULL) { |
| 569 | kfree(cfg); | 571 | kfree(cfg); |