diff options
author | eivind <eivind@FreeBSD.org> | 1999-04-11 02:46:20 +0000 |
---|---|---|
committer | eivind <eivind@FreeBSD.org> | 1999-04-11 02:46:20 +0000 |
commit | 74f19f24041c23015192f177a13b2c32d848453c (patch) | |
tree | 79bf901135b1cd7cbbe6a7dd7a17d83edf23be12 /sys/pci/pci_compat.c | |
parent | 6277625e29b232f21fe68c8532d1525e33bfb030 (diff) | |
download | FreeBSD-src-74f19f24041c23015192f177a13b2c32d848453c.zip FreeBSD-src-74f19f24041c23015192f177a13b2c32d848453c.tar.gz |
pci_register_lkm can fail gracefully, so let it do that when there is
no more memory (M_WAITOK -> M_NOWAIT). It may be called early enough
during boot that M_WAITOK isn't OK. (In theory - right now it isn't called
from anywhere).
Diffstat (limited to 'sys/pci/pci_compat.c')
-rw-r--r-- | sys/pci/pci_compat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/pci/pci_compat.c b/sys/pci/pci_compat.c index 9f4c612..f107e54 100644 --- a/sys/pci/pci_compat.c +++ b/sys/pci/pci_compat.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pci_compat.c,v 1.19 1999/01/14 06:22:10 jdp Exp $ + * $Id: pci_compat.c,v 1.20 1999/01/19 23:29:19 se Exp $ * */ @@ -460,7 +460,7 @@ int pci_register_lkm (struct pci_device *dvp, int if_revision) if (dvp == NULL || dvp->pd_probe == NULL || dvp->pd_attach == NULL) { return (-1); } - lkm = malloc (sizeof (*lkm), M_DEVBUF, M_WAITOK); + lkm = malloc (sizeof (*lkm), M_DEVBUF, M_NOWAIT); if (lkm == NULL) { return (-1); } |