diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /sound/oss/emu10k1/main.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'sound/oss/emu10k1/main.c')
| -rw-r--r-- | sound/oss/emu10k1/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/emu10k1/main.c b/sound/oss/emu10k1/main.c index 23241cbdd90f..0cd44a6f7ac0 100644 --- a/sound/oss/emu10k1/main.c +++ b/sound/oss/emu10k1/main.c | |||
| @@ -1320,7 +1320,7 @@ static int __devinit emu10k1_probe(struct pci_dev *pci_dev, const struct pci_dev | |||
| 1320 | card->is_aps = (subsysvid == EMU_APS_SUBID); | 1320 | card->is_aps = (subsysvid == EMU_APS_SUBID); |
| 1321 | 1321 | ||
| 1322 | spin_lock_init(&card->lock); | 1322 | spin_lock_init(&card->lock); |
| 1323 | init_MUTEX(&card->open_sem); | 1323 | mutex_init(&card->open_sem); |
| 1324 | card->open_mode = 0; | 1324 | card->open_mode = 0; |
| 1325 | init_waitqueue_head(&card->open_wait); | 1325 | init_waitqueue_head(&card->open_wait); |
| 1326 | 1326 | ||