← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-lts-vivid/trusty-proposed

« back to all changes in this revision

Viewing changes to drivers/ata/ahci.c

  • Committer: Package Import Robot
  • Author(s): Luis Henriques, Kamal Mostafa, K. Y. Srinivasan
  • Date: 2015-11-23 13:24:32 UTC
  • Revision ID: package-import@ubuntu.com-20151123132432-903xk653el60bfun
https://launchpad.net/bugs/1518519
https://launchpad.net/bugs/1508706
[ Kamal Mostafa ]

* Release Tracking Bug
  - LP: #1518519

[ K. Y. Srinivasan ]

* SAUCE: Drivers: hv: vmbus: Fix a Host signaling bug
  - LP: #1508706

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/ata/ahci.c
349
349
        /* JMicron 362B and 362C have an AHCI function with IDE class code */
350
350
        { PCI_VDEVICE(JMICRON, 0x2362), board_ahci_ign_iferr },
351
351
        { PCI_VDEVICE(JMICRON, 0x236f), board_ahci_ign_iferr },
 
352
        /* May need to update quirk_jmicron_async_suspend() for additions */
352
353
 
353
354
        /* ATI */
354
355
        { PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 */
1377
1378
        else if (pdev->vendor == 0x1c44 && pdev->device == 0x8000)
1378
1379
                ahci_pci_bar = AHCI_PCI_BAR_ENMOTUS;
1379
1380
 
1380
 
        /*
1381
 
         * The JMicron chip 361/363 contains one SATA controller and one
1382
 
         * PATA controller,for powering on these both controllers, we must
1383
 
         * follow the sequence one by one, otherwise one of them can not be
1384
 
         * powered on successfully, so here we disable the async suspend
1385
 
         * method for these chips.
1386
 
         */
1387
 
        if (pdev->vendor == PCI_VENDOR_ID_JMICRON &&
1388
 
                (pdev->device == PCI_DEVICE_ID_JMICRON_JMB363 ||
1389
 
                pdev->device == PCI_DEVICE_ID_JMICRON_JMB361))
1390
 
                device_disable_async_suspend(&pdev->dev);
1391
 
 
1392
1381
        /* acquire resources */
1393
1382
        rc = pcim_enable_device(pdev);
1394
1383
        if (rc)