From d0d8f9677e3d1cbfb34421f2d36182ba1db4ccbb Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 14 Aug 2012 13:45:53 -0700 Subject: [PATCH] --- yaml --- r: 324526 b: refs/heads/master c: 69af59970bec925d182ca5ebd80e643fdd90b1cc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/adl_pci7x3x.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f9dcdec186b9..35c6b6017c6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9291975d6647794710553630c2613b5658c81d3f +refs/heads/master: 69af59970bec925d182ca5ebd80e643fdd90b1cc diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci7x3x.c b/trunk/drivers/staging/comedi/drivers/adl_pci7x3x.c index 990670a3c5b1..41963fba4fc2 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci7x3x.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci7x3x.c @@ -121,7 +121,7 @@ static int adl_pci7x3x_do_insn_bits(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data) { - unsigned int reg = (unsigned int)s->private; + unsigned long reg = (unsigned long)s->private; unsigned int mask = data[0]; unsigned int bits = data[1]; @@ -147,7 +147,7 @@ static int adl_pci7x3x_di_insn_bits(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data) { - unsigned int reg = (unsigned int)s->private; + unsigned long reg = (unsigned long)s->private; data[1] = inl(dev->iobase + reg);