diff --git a/[refs] b/[refs]
index c1adf129dd99..edb53798067b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5d8d11931f3b772487381e7ca89dfd6e5b4f0fd
+refs/heads/master: 2f002cc9b8c5e59d3e67a184d7b1520fed9e3094
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
index b009c7b6a65e..0093a401e447 100644
--- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -966,10 +966,11 @@ static int pci9111_ai_insn_read(struct comedi_device *dev,
 				struct comedi_subdevice *s,
 				struct comedi_insn *insn, unsigned int *data)
 {
-	int resolution =
-	    ((struct pci9111_board *)dev->board_ptr)->ai_resolution;
-
-	int timeout, i;
+	unsigned int maxdata = s->maxdata;
+	unsigned int invert = (maxdata + 1) >> 1;
+	unsigned int shift = (maxdata == 0xffff) ? 0 : 4;
+	int timeout;
+	int i;
 
 	pci9111_ai_channel_set(CR_CHAN((&insn->chanspec)[0]));
 
@@ -995,14 +996,8 @@ static int pci9111_ai_insn_read(struct comedi_device *dev,
 
 conversion_done:
 
-		if (resolution == PCI9111_HR_AI_RESOLUTION)
-			data[i] = (inw(dev->iobase + PCI9111_AI_FIFO_REG)
-					& PCI9111_HR_AI_RESOLUTION_MASK)
-					^ PCI9111_HR_AI_RESOLUTION_2_CMP_BIT;
-		else
-			data[i] = ((inw(dev->iobase + PCI9111_AI_FIFO_REG) >> 4)
-					& PCI9111_AI_RESOLUTION_MASK)
-					^ PCI9111_AI_RESOLUTION_2_CMP_BIT;
+		data[i] = inw(dev->iobase + PCI9111_AI_FIFO_REG);
+		data[i] = ((data[i] >> shift) & maxdata) ^ invert;
 	}
 
 	return i;