diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/adl_pci9118.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index a2bd4e6..cb2843d 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c @@ -634,7 +634,7 @@ static unsigned int defragment_dma_buffer(struct comedi_device *dev, /* ============================================================================== */ -static unsigned int move_block_from_dma(struct comedi_device *dev, +static int move_block_from_dma(struct comedi_device *dev, struct comedi_subdevice *s, short *dma_buffer, unsigned int num_samples) diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 3acf7e6..19f79e8 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -250,7 +250,7 @@ static unsigned int labpc_serial_in(struct comedi_device *dev); static unsigned int labpc_eeprom_read(struct comedi_device *dev, unsigned int address); static unsigned int labpc_eeprom_read_status(struct comedi_device *dev); -static unsigned int labpc_eeprom_write(struct comedi_device *dev, +static int labpc_eeprom_write(struct comedi_device *dev, unsigned int address, unsigned int value); static void write_caldac(struct comedi_device *dev, unsigned int channel, @@ -1986,8 +1986,8 @@ static unsigned int labpc_eeprom_read(struct comedi_device *dev, return value; } -static unsigned int labpc_eeprom_write(struct comedi_device *dev, - unsigned int address, unsigned int value) +static int labpc_eeprom_write(struct comedi_device *dev, + unsigned int address, unsigned int value) { const int write_enable_instruction = 0x6; const int write_instruction = 0x2; |