git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'wberr-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
comedi
/
drivers
/
ni_mio_common.c
diff --git
a/drivers/staging/comedi/drivers/ni_mio_common.c
b/drivers/staging/comedi/drivers/ni_mio_common.c
index 2f7bfc1c59e5171583613d4ba58f06d34b4742e6..398347fedc476b3f186cbc38f4eb76271874b216 100644
(file)
--- a/
drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/
drivers/staging/comedi/drivers/ni_mio_common.c
@@
-1962,7
+1962,8
@@
static unsigned int ni_timer_to_ns(const struct comedi_device *dev, int timer)
static void ni_cmd_set_mite_transfer(struct mite_ring *ring,
struct comedi_subdevice *sdev,
const struct comedi_cmd *cmd,
- unsigned int max_count) {
+ unsigned int max_count)
+{
#ifdef PCIDMA
unsigned int nbytes = max_count;