Commit fc2fcdab authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] ES1371 OSS fix

from 2.4
only register gameport if the port is active
parent 72ecb383
...@@ -2963,7 +2963,8 @@ static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic ...@@ -2963,7 +2963,8 @@ static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic
/* turn on S/PDIF output driver if requested */ /* turn on S/PDIF output driver if requested */
outl(cssr, s->io+ES1371_REG_STATUS); outl(cssr, s->io+ES1371_REG_STATUS);
/* register gameport */ /* register gameport */
gameport_register_port(&s->gameport); if (s->gameport.io)
gameport_register_port(&s->gameport);
/* store it in the driver field */ /* store it in the driver field */
pci_set_drvdata(pcidev, s); pci_set_drvdata(pcidev, s);
/* put it into driver list */ /* put it into driver list */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment