Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325481
b: refs/heads/master
c: 62fea8c
h: refs/heads/master
i:
  325479: 02b9aec
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Sep 21, 2012
1 parent 49937d6 commit a58c17a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eb4332eff5aa071b19f89f45ae7f6393af59ba62
refs/heads/master: 62fea8c8f1bf5ca33ba55b3f421d9598a68297ee
10 changes: 5 additions & 5 deletions trunk/drivers/staging/comedi/drivers/ni_labpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ static int labpc_eeprom_write_insn(struct comedi_device *dev,
static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd,
enum scan_mode scan_mode);
#ifdef CONFIG_ISA_DMA_API
static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd);
static unsigned int labpc_suggest_transfer_size(const struct comedi_cmd *cmd);
#endif
static int labpc_dio_mem_callback(int dir, int port, int data,
unsigned long arg);
Expand Down Expand Up @@ -1318,7 +1318,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
set_dma_addr(devpriv->dma_chan,
virt_to_bus(devpriv->dma_buffer));
/* set appropriate size of transfer */
devpriv->dma_transfer_size = labpc_suggest_transfer_size(*cmd);
devpriv->dma_transfer_size = labpc_suggest_transfer_size(cmd);
if (cmd->stop_src == TRIG_COUNT &&
devpriv->count * sample_size < devpriv->dma_transfer_size) {
devpriv->dma_transfer_size =
Expand Down Expand Up @@ -1771,13 +1771,13 @@ static int labpc_eeprom_write_insn(struct comedi_device *dev,

#ifdef CONFIG_ISA_DMA_API
/* utility function that suggests a dma transfer size in bytes */
static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd)
static unsigned int labpc_suggest_transfer_size(const struct comedi_cmd *cmd)
{
unsigned int size;
unsigned int freq;

if (cmd.convert_src == TRIG_TIMER)
freq = 1000000000 / cmd.convert_arg;
if (cmd->convert_src == TRIG_TIMER)
freq = 1000000000 / cmd->convert_arg;
/* return some default value */
else
freq = 0xffffffff;
Expand Down

0 comments on commit a58c17a

Please sign in to comment.