diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /sound/isa/wavefront/wavefront_fx.c | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'sound/isa/wavefront/wavefront_fx.c')
| -rw-r--r-- | sound/isa/wavefront/wavefront_fx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c index 2efaa7f205aa..dfc449a2194e 100644 --- a/sound/isa/wavefront/wavefront_fx.c +++ b/sound/isa/wavefront/wavefront_fx.c | |||
| @@ -180,11 +180,11 @@ snd_wavefront_fx_ioctl (struct snd_hwdep *sdev, struct file *file, | |||
| 180 | unsigned short *pd; | 180 | unsigned short *pd; |
| 181 | int err = 0; | 181 | int err = 0; |
| 182 | 182 | ||
| 183 | snd_assert(sdev->card != NULL, return -ENODEV); | ||
| 184 | |||
| 185 | card = sdev->card; | 183 | card = sdev->card; |
| 186 | 184 | if (snd_BUG_ON(!card)) | |
| 187 | snd_assert(card->private_data != NULL, return -ENODEV); | 185 | return -ENODEV; |
| 186 | if (snd_BUG_ON(!card->private_data)) | ||
| 187 | return -ENODEV; | ||
| 188 | 188 | ||
| 189 | acard = card->private_data; | 189 | acard = card->private_data; |
| 190 | dev = &acard->wavefront; | 190 | dev = &acard->wavefront; |