hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: rtd520: ioremap'ed addresses are resource_size_t 

As mentioned by Ian Abbott, the pci address passed to ioremap
should be a resource_size_t not an unsigned long. Use a local
variable of that type to hold the pci_resource_start() that is
passed to ioremp().

Set the dev->iobase to a dummy non-zero value so that the "detach"
can use it as a flag to know that comedi_pci_disable() needs to
be called.

Reported-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-07-20 10:33:08 -07:00 committed by Greg Kroah-Hartman
parent 2724f01856
commit a26f4dd0eb
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/comedi/drivers/rtd520.c
View File

@ -1619,9 +1619,8 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct rtdPrivate *devpriv; struct rtdPrivate *devpriv;
struct pci_dev *pcidev; struct pci_dev *pcidev;
struct comedi_subdevice *s; struct comedi_subdevice *s;
resource_size_t pci_base;
int ret; int ret;
resource_size_t physLas1; /* data area */
resource_size_t physLcfg; /* PLX9080 */
#ifdef USE_DMA #ifdef USE_DMA
int index; int index;
#endif #endif
@ -1655,20 +1654,15 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
printk(KERN_INFO "Failed to enable PCI device and request regions.\n"); printk(KERN_INFO "Failed to enable PCI device and request regions.\n");
return ret; return ret;
} }
dev->iobase = 1; /* the "detach" needs this */
/* /* Initialize the base addresses */
* Initialize base addresses pci_base = pci_resource_start(pcidev, LAS0_PCIINDEX);
*/ devpriv->las0 = ioremap_nocache(pci_base, LAS0_PCISIZE);
/* Get the physical address from PCI config */ pci_base = pci_resource_start(pcidev, LAS1_PCIINDEX);
dev->iobase = pci_resource_start(pcidev, LAS0_PCIINDEX); devpriv->las1 = ioremap_nocache(pci_base, LAS1_PCISIZE);
physLas1 = pci_resource_start(pcidev, LAS1_PCIINDEX); pci_base = pci_resource_start(pcidev, LCFG_PCIINDEX);
physLcfg = pci_resource_start(pcidev, LCFG_PCIINDEX); devpriv->lcfg = ioremap_nocache(pci_base, LCFG_PCISIZE);
/* Now have the kernel map this into memory */
/* ASSUME page aligned */
devpriv->las0 = ioremap_nocache(dev->iobase, LAS0_PCISIZE);
devpriv->las1 = ioremap_nocache(physLas1, LAS1_PCISIZE);
devpriv->lcfg = ioremap_nocache(physLcfg, LCFG_PCISIZE);
if (!devpriv->las0 || !devpriv->las1 || !devpriv->lcfg) if (!devpriv->las0 || !devpriv->las1 || !devpriv->lcfg)
return -ENOMEM; return -ENOMEM;