summaryrefslogtreecommitdiff
path: root/sound/pcmcia/vx/vx_entry.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-23 05:50:57 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-23 05:50:57 +0400
commita5324343955997d1439f26518ddac567cd5d134b (patch)
treef43558389c41e3a0f076c4ee55d77c4aa1561779 /sound/pcmcia/vx/vx_entry.c
parent8199d3a79c224bbe5943fa08684e1f93a17881b0 (diff)
parenta4936044001694f033fe4ea94d6034d51a6b465c (diff)
downloadlinux-a5324343955997d1439f26518ddac567cd5d134b.tar.xz
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'sound/pcmcia/vx/vx_entry.c')
-rw-r--r--sound/pcmcia/vx/vx_entry.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pcmcia/vx/vx_entry.c b/sound/pcmcia/vx/vx_entry.c
index 53d8172c52ae..332bbca3dfc4 100644
--- a/sound/pcmcia/vx/vx_entry.c
+++ b/sound/pcmcia/vx/vx_entry.c
@@ -68,8 +68,7 @@ static int snd_vxpocket_free(vx_core_t *chip)
if (hw)
hw->card_list[vxp->index] = NULL;
chip->card = NULL;
- if (chip->dev)
- kfree(chip->dev);
+ kfree(chip->dev);
snd_vx_free_firmware(chip);
kfree(chip);