evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: adl_pci8164: remove buggy dev_dbg()

Browse source 
The dev_dbg() messages in the adl_pci8164_insn_{read,out} functions
output the 'data' that was read/write to the device. Two 'data' values
are always printed, data[0] and data[1].

The 'data' pointer points to an array of unsigned int values. The number
of values in the array is indicated by insn->n. The number of data
elements is never checked so the dev_dbg() could be trying to access
a 'data' element that is invalid.

Instead of fixing the dev_dbg() just remove them. They are really just
added noise.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-03-06 15:57:24 -07:00 • committed by Greg Kroah-Hartman
parent 42169e2d8a
commit fff7a2cc99
1 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/staging/comedi/drivers/adl_pci8164.c
View file

@ -64,36 +64,27 @@ static void adl_pci8164_insn_read(struct comedi_device *dev,
char *action, unsigned short offset) char *action, unsigned short offset)
{ {
int axis, axis_reg; int axis, axis_reg;
char axisname;
axis = CR_CHAN(insn->chanspec); axis = CR_CHAN(insn->chanspec);
switch (axis) { switch (axis) {
case 0: case 0:
axis_reg = PCI8164_AXIS_X; axis_reg = PCI8164_AXIS_X;
axisname = 'X';
break; break;
case 1: case 1:
axis_reg = PCI8164_AXIS_Y; axis_reg = PCI8164_AXIS_Y;
axisname = 'Y';
break; break;
case 2: case 2:
axis_reg = PCI8164_AXIS_Z; axis_reg = PCI8164_AXIS_Z;
axisname = 'Z';
break; break;
case 3: case 3:
axis_reg = PCI8164_AXIS_U; axis_reg = PCI8164_AXIS_U;
axisname = 'U';
break; break;
default: default:
axis_reg = PCI8164_AXIS_X; axis_reg = PCI8164_AXIS_X;
axisname = 'X';
} }
data[0] = inw(dev->iobase + axis_reg + offset); data[0] = inw(dev->iobase + axis_reg + offset);
dev_dbg(dev->class_dev,
"pci8164 %s read -> %04X:%04X on axis %c\n",
action, data[0], data[1], axisname);
} }
static int adl_pci8164_insn_read_msts(struct comedi_device *dev, static int adl_pci8164_insn_read_msts(struct comedi_device *dev,
@ -144,38 +135,26 @@ static void adl_pci8164_insn_out(struct comedi_device *dev,
{ {
unsigned int axis, axis_reg; unsigned int axis, axis_reg;
char axisname;
axis = CR_CHAN(insn->chanspec); axis = CR_CHAN(insn->chanspec);
switch (axis) { switch (axis) {
case 0: case 0:
axis_reg = PCI8164_AXIS_X; axis_reg = PCI8164_AXIS_X;
axisname = 'X';
break; break;
case 1: case 1:
axis_reg = PCI8164_AXIS_Y; axis_reg = PCI8164_AXIS_Y;
axisname = 'Y';
break; break;
case 2: case 2:
axis_reg = PCI8164_AXIS_Z; axis_reg = PCI8164_AXIS_Z;
axisname = 'Z';
break; break;
case 3: case 3:
axis_reg = PCI8164_AXIS_U; axis_reg = PCI8164_AXIS_U;
axisname = 'U';
break; break;
default: default:
axis_reg = PCI8164_AXIS_X; axis_reg = PCI8164_AXIS_X;
axisname = 'X';
} }
outw(data[0], dev->iobase + axis_reg + offset); outw(data[0], dev->iobase + axis_reg + offset);
dev_dbg(dev->class_dev,
"pci8164 %s write -> %04X:%04X on axis %c\n",
action, data[0], data[1], axisname);
} }
static int adl_pci8164_insn_write_cmd(struct comedi_device *dev, static int adl_pci8164_insn_write_cmd(struct comedi_device *dev,