diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-08-16 06:56:53 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-09-23 04:41:05 -0400 |
commit | 80b556f26b3830ad5bd6ff9f701675ac8afcb263 (patch) | |
tree | 8bcd0bc1cd32c9f6fb0e675670625a0d0f4003a3 /sound/pci/emu10k1/emu10k1x.c | |
parent | 5e4968e24ced93b7b130e7e1fc947a79f82776bf (diff) |
[ALSA] emu10k1x: simplify around pci_register_driver()
Report errors to modprobe as side effect.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/emu10k1/emu10k1x.c')
-rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index bda8bdf59935..da1610a571b8 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -1626,12 +1626,7 @@ static struct pci_driver driver = { | |||
1626 | // initialization of the module | 1626 | // initialization of the module |
1627 | static int __init alsa_card_emu10k1x_init(void) | 1627 | static int __init alsa_card_emu10k1x_init(void) |
1628 | { | 1628 | { |
1629 | int err; | 1629 | return pci_register_driver(&driver); |
1630 | |||
1631 | if ((err = pci_register_driver(&driver)) > 0) | ||
1632 | return err; | ||
1633 | |||
1634 | return 0; | ||
1635 | } | 1630 | } |
1636 | 1631 | ||
1637 | // clean up the module | 1632 | // clean up the module |