From fcef8ac646ced2bbc8df51d47738b021e1d996f0 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 18 Sep 2012 18:50:05 -0700 Subject: [PATCH] --- yaml --- r: 325429 b: refs/heads/master c: bdf7c9dc10912dbad3a5052ee824546535e0b4c1 h: refs/heads/master i: 325427: 8499669fad5eb530508e8cc442964e6181980d6e v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/daqboard2000.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2909878eaba7..97ad38f5c824 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a3f3d37c58ea44a2441fe8be4d8cd0996fc0c3c +refs/heads/master: bdf7c9dc10912dbad3a5052ee824546535e0b4c1 diff --git a/trunk/drivers/staging/comedi/drivers/daqboard2000.c b/trunk/drivers/staging/comedi/drivers/daqboard2000.c index 88037aea25ac..69bc0e5d8eed 100644 --- a/trunk/drivers/staging/comedi/drivers/daqboard2000.c +++ b/trunk/drivers/staging/comedi/drivers/daqboard2000.c @@ -122,9 +122,6 @@ Configuration options: not applicable, uses PCI auto config #define DAQBOARD2000_SUBSYSTEM_IDS2 0x0002 /* Daqboard/2000 - 2 Dacs */ #define DAQBOARD2000_SUBSYSTEM_IDS4 0x0004 /* Daqboard/2000 - 4 Dacs */ -#define DAQBOARD2000_DAQ_SIZE 0x1002 -#define DAQBOARD2000_PLX_SIZE 0x100 - /* Initialization bits for the Serial EEPROM Control Register */ #define DAQBOARD2000_SECRProgPinHi 0x8001767e #define DAQBOARD2000_SECRProgPinLo 0x8000767e @@ -721,9 +718,9 @@ static int daqboard2000_attach_pci(struct comedi_device *dev, dev->iobase = 1; /* the "detach" needs this */ pci_base = pci_resource_start(pcidev, 0); - devpriv->plx = ioremap(pci_base, DAQBOARD2000_PLX_SIZE); + devpriv->plx = ioremap(pci_base, pci_resource_len(pcidev, 0)); pci_base = pci_resource_start(pcidev, 2); - devpriv->daq = ioremap(pci_base, DAQBOARD2000_DAQ_SIZE); + devpriv->daq = ioremap(pci_base, pci_resource_len(pcidev, 2)); if (!devpriv->plx || !devpriv->daq) return -ENOMEM;