Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2e32725c6ae8fa5345d9d095742e175ff4badd3b

Authored by Muli Ben-Yehuda
Committed by Linus Torvalds
1 parent 3b20b9b4e9

OSS trident: replace deprecated pci_find_device with pci_get_device 

Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 5 additions and 3 deletions Side-by-side Diff

... ... @@ -4454,9 +4454,9 @@
4454 4454  
4455 4455 /* Add H/W Volume Control By Matt Wu Jul. 06, 2001 */
4456 4456 card->hwvolctl = 0;
4457   - pci_dev_m1533 = pci_find_device(PCI_VENDOR_ID_AL,
4458   - PCI_DEVICE_ID_AL_M1533,
4459   - pci_dev_m1533);
  4457 + pci_dev_m1533 = pci_get_device(PCI_VENDOR_ID_AL,
  4458 + PCI_DEVICE_ID_AL_M1533,
  4459 + pci_dev_m1533);
4460 4460 rc = -ENODEV;
4461 4461 if (pci_dev_m1533 == NULL)
4462 4462 goto out_proc_fs;
... ... @@ -4470,6 +4470,8 @@
4470 4470 bits &= 0xbf; /*clear bit 6 */
4471 4471 pci_write_config_byte(pci_dev_m1533, 0x7b, bits);
4472 4472 }
  4473 + pci_dev_put(pci_dev_m1533);
  4474 +
4473 4475 } else if (card->pci_id == PCI_DEVICE_ID_INTERG_5050) {
4474 4476 card->alloc_pcm_channel = cyber_alloc_pcm_channel;
4475 4477 card->alloc_rec_pcm_channel = cyber_alloc_pcm_channel;