diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2006-03-23 12:05:47 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2006-03-23 12:05:47 -0500 |
| commit | a05ba4561fa3ad8b64a27577d0d38c190f60f762 (patch) | |
| tree | 5eb7561113e006b7bad0bef50dec6821962b1b36 /sound/oss/emu10k1/main.c | |
| parent | 74293759002aa7db0179158c20676a034614577b (diff) | |
| parent | b0e6e962992b76580f4900b166a337bad7c1e81b (diff) | |
Merge branch 'master' of /home/aia21/ntfs-2.6/
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 | ||