diff options
| -rw-r--r-- | drivers/staging/comedi/comedi.h | 6 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index 17c014922b7f..e6b5f16edb02 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -305,13 +305,11 @@ enum comedi_support_level { #define COMEDI_INSNLIST _IOR(CIO, 11, struct comedi_insnlist) #define COMEDI_INSN _IOR(CIO, 12, struct comedi_insn) #define COMEDI_BUFCONFIG _IOR(CIO, 13, struct comedi_bufconfig) -#define COMEDI_BUFINFO _IOWR(CIO, 14, comedi_bufinfo) +#define COMEDI_BUFINFO _IOWR(CIO, 14, struct comedi_bufinfo) #define COMEDI_POLL _IO(CIO, 15) /* structures */ -typedef struct comedi_bufinfo_struct comedi_bufinfo; - struct comedi_trig { unsigned int subdev; /* subdevice */ unsigned int mode; /* mode */ @@ -426,7 +424,7 @@ struct comedi_bufconfig { unsigned int unused[4]; }; -struct comedi_bufinfo_struct { +struct comedi_bufinfo { unsigned int subdevice; unsigned int bytes_read; diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 5cb6031656bb..19dce2ebfc19 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -556,11 +556,11 @@ static int do_chaninfo_ioctl(struct comedi_device *dev, struct comedi_chaninfo * */ static int do_bufinfo_ioctl(struct comedi_device *dev, void *arg) { - comedi_bufinfo bi; + struct comedi_bufinfo bi; struct comedi_subdevice *s; struct comedi_async *async; - if (copy_from_user(&bi, arg, sizeof(comedi_bufinfo))) + if (copy_from_user(&bi, arg, sizeof(struct comedi_bufinfo))) return -EFAULT; if (bi.subdevice >= dev->n_subdevices || bi.subdevice < 0) @@ -601,7 +601,7 @@ static int do_bufinfo_ioctl(struct comedi_device *dev, void *arg) bi.buf_read_ptr = async->buf_read_ptr; copyback: - if (copy_to_user(arg, &bi, sizeof(comedi_bufinfo))) + if (copy_to_user(arg, &bi, sizeof(struct comedi_bufinfo))) return -EFAULT; return 0; |