From 6efa1e863f0b48e8c504a62bbecfad4af5334ef0 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 17 Sep 2012 13:17:19 -0700 Subject: [PATCH] --- yaml --- r: 325396 b: refs/heads/master c: 57991b6bfc2b0faafb7d42edbd1673903d76b853 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/jr3_pci.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2b315546410f..ea286dbfb38b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 920e2ffbe243fb0555b2c238e26fe7dbc03db98c +refs/heads/master: 57991b6bfc2b0faafb7d42edbd1673903d76b853 diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c index 4b7cfe342c79..360107c4dcab 100644 --- a/trunk/drivers/staging/comedi/drivers/jr3_pci.c +++ b/trunk/drivers/staging/comedi/drivers/jr3_pci.c @@ -366,7 +366,7 @@ static int read_idm_word(const u8 *data, size_t size, int *pos, unsigned int *val) { int result = 0; - if (pos != 0 && val != 0) { + if (pos && val) { /* Skip over non hex */ for (; *pos < size && !isxdigit(data[*pos]); (*pos)++) { } @@ -876,7 +876,7 @@ static int jr3_pci_attach(struct comedi_device *dev, p->maxdata_list[56] = 0xffff; p->maxdata_list[57] = 0xffff; /* Channel specific range and maxdata */ - dev->subdevices[i].range_table = 0; + dev->subdevices[i].range_table = NULL; dev->subdevices[i].range_table_list = p->range_table_list; dev->subdevices[i].maxdata = 0;