diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-02-20 10:52:50 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-02-20 10:52:50 +0300 |
| commit | fc0e23fad33198fc7d74227dba7bbc3a5d7755aa (patch) | |
| tree | 669319e33fb63a456986b6ac41cf3b584f583caf /sound/oss/ad1848.c | |
| parent | af677166cf63c179dc2485053166e02c4aea01eb (diff) | |
| parent | 3bb9eca913025ed05c0510de831c67b7bef652c5 (diff) | |
| download | linux-fc0e23fad33198fc7d74227dba7bbc3a5d7755aa.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/oss/ad1848.c')
| -rw-r--r-- | sound/oss/ad1848.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c index 6368e5c7d0ba..f6156d8169d0 100644 --- a/sound/oss/ad1848.c +++ b/sound/oss/ad1848.c @@ -121,11 +121,6 @@ static bool deskpro_xl; static bool deskpro_m; static bool soundpro; -static volatile signed char irq2dev[17] = { - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1 -}; - #ifndef EXCLUDE_TIMERS static int timer_installed = -1; #endif @@ -2060,7 +2055,7 @@ int ad1848_init (char *name, struct resource *ports, int irq, int dma_playback, else devc->irq_ok = 1; /* Couldn't test. assume it's OK */ } else if (irq < 0) - irq2dev[-irq] = devc->dev_no = my_dev; + devc->dev_no = my_dev; #ifndef EXCLUDE_TIMERS if ((capabilities[devc->model].flags & CAP_F_TIMER) && |