From ed0fede2b1c15f1979f9679f9fd8bdbd1bfb7904 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 10 Apr 2013 11:31:05 -0700 Subject: [PATCH] --- yaml --- r: 364113 b: refs/heads/master c: 8567a85168ae6bfbf7e566fe9e16d36a1d23fde7 h: refs/heads/master i: 364111: 1cba4aa9b7ed46b1bad05baa0a7c214a685bb3a2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/jr3_pci.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 54843991ed55..f0a825ec1539 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc3750883c161b595be02bf235bd38747a68f0d7 +refs/heads/master: 8567a85168ae6bfbf7e566fe9e16d36a1d23fde7 diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c index 653c5c3891e1..90b303ab2300 100644 --- a/trunk/drivers/staging/comedi/drivers/jr3_pci.c +++ b/trunk/drivers/staging/comedi/drivers/jr3_pci.c @@ -705,9 +705,7 @@ static int jr3_pci_auto_attach(struct comedi_device *dev, if (result) return result; - devpriv->iobase = ioremap(pci_resource_start(pcidev, 0), - offsetof(struct jr3_t, - channel[devpriv->n_channels])); + devpriv->iobase = pci_ioremap_bar(pcidev, 0); if (!devpriv->iobase) return -ENOMEM;