From e2c558d71253e0599fba483930e8225567965d3e Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 25 Oct 2012 15:07:52 -0700
Subject: [PATCH] --- yaml --- r: 337320 b: refs/heads/master c:
 78830a75b40aba0163203f80ec88e8f8b1596777 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/comedi/drivers/me_daq.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 0a7f1299c95a..e0a7cf84c37b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f15c0a65dfd400a100ed5b6ae6dbcc6ac0863e02
+refs/heads/master: 78830a75b40aba0163203f80ec88e8f8b1596777
diff --git a/trunk/drivers/staging/comedi/drivers/me_daq.c b/trunk/drivers/staging/comedi/drivers/me_daq.c
index 7fd94000af95..f14907e4940d 100644
--- a/trunk/drivers/staging/comedi/drivers/me_daq.c
+++ b/trunk/drivers/staging/comedi/drivers/me_daq.c
@@ -178,11 +178,9 @@ struct me_board {
 	int device_id;
 	int ao_channel_nbr;	/* DA config */
 	int ao_resolution;
-	int ao_resolution_mask;
 	const struct comedi_lrange *ao_range_list;
 	int ai_channel_nbr;	/* AD config */
 	int ai_resolution;
-	int ai_resolution_mask;
 	const struct comedi_lrange *ai_range_list;
 	int dio_channel_nbr;	/* DIO config */
 };
@@ -194,12 +192,10 @@ static const struct me_board me_boards[] = {
 	 /* Analog Output */
 	 .ao_channel_nbr = 4,
 	 .ao_resolution = 12,
-	 .ao_resolution_mask = 0x0fff,
 	 .ao_range_list = &me2600_ao_range,
 	 .ai_channel_nbr = 16,
 	 /* Analog Input */
 	 .ai_resolution = 12,
-	 .ai_resolution_mask = 0x0fff,
 	 .ai_range_list = &me2600_ai_range,
 	 .dio_channel_nbr = 32,
 	 },
@@ -209,7 +205,6 @@ static const struct me_board me_boards[] = {
 	 .ai_channel_nbr = 16,
 	 /* Analog Input */
 	 .ai_resolution = 12,
-	 .ai_resolution_mask = 0x0fff,
 	 .ai_range_list = &me2000_ai_range,
 	 .dio_channel_nbr = 32,
 	 }
@@ -721,7 +716,7 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 	s->type = COMEDI_SUBD_AI;
 	s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_CMD_READ;
 	s->n_chan = board->ai_channel_nbr;
-	s->maxdata = board->ai_resolution_mask;
+	s->maxdata = (1 << board->ai_resolution) - 1;
 	s->len_chanlist = board->ai_channel_nbr;
 	s->range_table = board->ai_range_list;
 	s->cancel = me_ai_cancel;
@@ -734,7 +729,7 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 		s->type = COMEDI_SUBD_AO;
 		s->subdev_flags = SDF_WRITEABLE | SDF_COMMON;
 		s->n_chan = board->ao_channel_nbr;
-		s->maxdata = board->ao_resolution_mask;
+		s->maxdata = (1 << board->ao_resolution) - 1;
 		s->len_chanlist = board->ao_channel_nbr;
 		s->range_table = board->ao_range_list;
 		s->insn_read = me_ao_insn_read;