Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[firefly-linux-kernel-4.4.55.git] / drivers / staging / comedi / drivers / serial2002.c

diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index 304ebff119eeac1cd83a70cd318b5957b2135f11..83da162deb526c0a790efba41b23ff4784e563b8 100644 (file)
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -373,7 +373,7 @@ static int serial2002_setup_subdevice(struct comedi_subdevice *s,
                if (cfg[j].kind == kind) {
                        if (mapping)
                                mapping[chan] = j;
-                       if (range) {
+                       if (range && range_table_list) {
                                range[j].length = 1;
                                range[j].range.min = cfg[j].min;
                                range[j].range.max = cfg[j].max;