From b246620217750022e1d0956fda7dbb3826cb0108 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 18 Sep 2012 18:50:23 -0700 Subject: [PATCH] --- yaml --- r: 325430 b: refs/heads/master c: 0352b932be274d0d67b02f93fe94e30e57265f85 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/daqboard2000.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 97ad38f5c824..972fa19ba0a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdf7c9dc10912dbad3a5052ee824546535e0b4c1 +refs/heads/master: 0352b932be274d0d67b02f93fe94e30e57265f85 diff --git a/trunk/drivers/staging/comedi/drivers/daqboard2000.c b/trunk/drivers/staging/comedi/drivers/daqboard2000.c index 69bc0e5d8eed..d13c8c5822bf 100644 --- a/trunk/drivers/staging/comedi/drivers/daqboard2000.c +++ b/trunk/drivers/staging/comedi/drivers/daqboard2000.c @@ -696,7 +696,6 @@ static int daqboard2000_attach_pci(struct comedi_device *dev, const struct daq200_boardtype *board; struct daqboard2000_private *devpriv; struct comedi_subdevice *s; - resource_size_t pci_base; int result; comedi_set_hw_dev(dev, &pcidev->dev); @@ -717,10 +716,10 @@ static int daqboard2000_attach_pci(struct comedi_device *dev, return result; dev->iobase = 1; /* the "detach" needs this */ - pci_base = pci_resource_start(pcidev, 0); - devpriv->plx = ioremap(pci_base, pci_resource_len(pcidev, 0)); - pci_base = pci_resource_start(pcidev, 2); - devpriv->daq = ioremap(pci_base, pci_resource_len(pcidev, 2)); + devpriv->plx = ioremap(pci_resource_start(pcidev, 0), + pci_resource_len(pcidev, 0)); + devpriv->daq = ioremap(pci_resource_start(pcidev, 2), + pci_resource_len(pcidev, 2)); if (!devpriv->plx || !devpriv->daq) return -ENOMEM;