summaryrefslogtreecommitdiff
path: root/kernel/tor2.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-02-21 17:51:17 +0000
committerkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-02-21 17:51:17 +0000
commit70a006080b5b2ee7ca463739252b60c526ce2913 (patch)
tree448432d8d2c299fe1750824256d4b30f5044978e /kernel/tor2.c
parent9b6044503bbded2291fad9681cbc2210048048a8 (diff)
the tor2 private structure has a field for the corresponding PCI device pointer, but it was never filled in... since it is now being used in the init_spans() function, this caused a NULL pointer dereference. solve that problem by actually filling in the pointer variable that already existed :-)
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3863 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/tor2.c')
-rw-r--r--kernel/tor2.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/tor2.c b/kernel/tor2.c
index b0962f2..55939e2 100644
--- a/kernel/tor2.c
+++ b/kernel/tor2.c
@@ -372,6 +372,7 @@ static int __devinit tor2_probe(struct pci_dev *pdev, const struct pci_device_id
memset(tor->chans[x],0,sizeof(struct zt_chan) * 31);
}
/* Load the resources */
+ tor->pci = pdev;
tor->irq = pdev->irq;
if (tor->irq < 1) {
printk(KERN_ERR "No IRQ allocated for device\n");