From 29206c34220eeb3a6f6bd63e502f33aac459285e Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Thu, 14 Jul 2011 21:54:18 +0000 Subject: [PATCH] --- yaml --- r: 263027 b: refs/heads/master c: 6457d9b350b3f4f2098984eee016c6c994b9c096 h: refs/heads/master i: 263025: d0e3a2d00c65624361ff500480cdb9e2e7181ca6 263023: cb983c54739517744e7d4221b5e5f87eae5d296a v: v3 --- [refs] | 2 +- trunk/Documentation/PCI/MSI-HOWTO.txt | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e38fa8bfedba..8a4a320ca0a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed737c1882c652f0b5a888df59895b5dc2d10cd7 +refs/heads/master: 6457d9b350b3f4f2098984eee016c6c994b9c096 diff --git a/trunk/Documentation/PCI/MSI-HOWTO.txt b/trunk/Documentation/PCI/MSI-HOWTO.txt index c504f12bcc61..28d1ceeea655 100644 --- a/trunk/Documentation/PCI/MSI-HOWTO.txt +++ b/trunk/Documentation/PCI/MSI-HOWTO.txt @@ -171,7 +171,8 @@ which should be at least 'nvec' entries in size. On success, the device is switched into MSI-X mode and the function returns 0. The 'vector' member in each entry is populated with the interrupt number; the driver should then call request_irq() for each 'vector' that it -decides to use. +decides to use. The device driver is responsible for keeping track of the +interrupts assigned to the MSI-X vectors so it can free them again later. If this function returns a negative number, it indicates an error and the driver should not attempt to allocate any more MSI-X interrupts for @@ -181,9 +182,7 @@ below. This function, in contrast with pci_enable_msi(), does not adjust dev->irq. The device will not generate interrupts for this interrupt -number once MSI-X is enabled. The device driver is responsible for -keeping track of the interrupts assigned to the MSI-X vectors so it can -free them again later. +number once MSI-X is enabled. Device drivers should normally call this function once per device during the initialization phase.