staging: comedi: fix scan_end_arg == chanlist_len assumption

Some comedi drivers allow the `scan_end_arg` value of an asynchronous
command to be a multiple (> 1) of the `chanlist_len` although most
require them to be the same value.

`comedi_bytes_per_scan()` is incorrectly using `chanlist_len` as the
length of the scan.  Change it to use `scan_end_arg`.

`comedi_nsamples_left()` is incorrectly using `cur_chan` as the current
sample position in the scan (it is actually the current position in the
channel list).  Change it to use the actual sample position in the scan.
(Unfortunately we only have the current scan position in bytes currently,
so convert that to a sample position.)

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 82ac84504589e01f25b115cf1aba5e33ec15bef9..e516ed907f7e412450989bb2305a79a2b02bc3da 100644 (file)
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -317,10 +317,10 @@ unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s)
        case COMEDI_SUBD_DO:
        case COMEDI_SUBD_DIO:
                bits_per_sample = 8 * comedi_bytes_per_sample(s);
-               num_samples = DIV_ROUND_UP(cmd->chanlist_len, bits_per_sample);
+               num_samples = DIV_ROUND_UP(cmd->scan_end_arg, bits_per_sample);
                break;
        default:
-               num_samples = cmd->chanlist_len;
+               num_samples = cmd->scan_end_arg;
                break;
        }
        return comedi_samples_to_bytes(s, num_samples);
@@ -384,11 +384,13 @@ unsigned int comedi_nsamples_left(struct comedi_subdevice *s,
                /* +1 to force comedi_nscans_left() to return the scans left */
                unsigned int nscans = (nsamples / cmd->scan_end_arg) + 1;
                unsigned int scans_left = comedi_nscans_left(s, nscans);
+               unsigned int scan_pos =
+                   comedi_bytes_to_samples(s, async->scan_progress);
                unsigned long long samples_left = 0;
 
                if (scans_left) {
                        samples_left = ((unsigned long long)scans_left *
-                                      cmd->scan_end_arg) - async->cur_chan;
+                                       cmd->scan_end_arg) - scan_pos;
                }
 
                if (samples_left < nsamples)