From: H Hartley Sweeten Date: Mon, 25 Aug 2014 22:23:50 +0000 (-0700) Subject: staging: comedi: ni_mio_common: fix local var for 32-bit read X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0557344e21497fce9475dfe3f41fd92d57d8a274;p=deliverable%2Flinux.git staging: comedi: ni_mio_common: fix local var for 32-bit read The local variable 'd' is used to read a 32-bit register. One branch of the code shifts the register value 16 bits to the right to get the high 16-bits. Change the type of the local variable so that this shift works correctly. Reported by: coverity Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c index 8b3ba40cb74c..c42ba22b91d2 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -2108,7 +2108,7 @@ static int ni_ai_insn_read(struct comedi_device *dev, unsigned int mask = (s->maxdata + 1) >> 1; int i, n; unsigned signbits; - unsigned short d; + unsigned int d; unsigned long dl; ni_load_channelgain_list(dev, s, 1, &insn->chanspec);