]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: comedi: jr3_pci: fix iomem dereference
authorIan Abbott <abbotti@mev.co.uk>
Thu, 27 Sep 2012 16:45:27 +0000 (17:45 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 7 Oct 2012 15:39:31 +0000 (08:39 -0700)
commit e1878957b4676a17cf398f7f5723b365e9a2ca48 upstream.

Correct a direct dereference of I/O memory to use an appropriate I/O
memory access function.  Note that the pointer being dereferenced is not
currently tagged with `__iomem` but I plan to correct that for 3.7.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/jr3_pci.c

index 93f94cd7bae2e86d890b4006c9dfb19ee414804a..9c133a0ea8174faf4a7fadacfbcafb05d3942fe1 100644 (file)
@@ -884,7 +884,7 @@ static int jr3_pci_attach(struct comedi_device *dev,
        }
 
        /*  Reset DSP card */
-       devpriv->iobase->channel[0].reset = 0;
+       writel(0, &devpriv->iobase->channel[0].reset);
 
        result = comedi_load_firmware(dev, "jr3pci.idm", jr3_download_firmware);
        dev_dbg(dev->class_dev, "Firmare load %d\n", result);