From 186dd451c0a904c74cfcc62a5a68849e07691785 Mon Sep 17 00:00:00 2001 From: Kumar Amit Mehta Date: Wed, 7 Nov 2012 04:08:09 -0800 Subject: [PATCH] --- yaml --- r: 337743 b: refs/heads/master c: 7803d8e05d63d743e938233eb49fd8f112dfb07e h: refs/heads/master i: 337741: 78d56e87c6300f0b48ccf8b3a5faa1f75cb6573b 337739: 1527b8463df96144792bfa89debaa4cadab26c80 337735: 41c9a1b79ee00abbbc755043dea2bfdb4e240da8 337727: 583667475d3927e5cf9a5747fdab24fed25d668c v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/jr3_pci.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d28545499168..f9599bdf3ea4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c965c8b7d2538d10d77a320e84ddbe51d221f373 +refs/heads/master: 7803d8e05d63d743e938233eb49fd8f112dfb07e diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c index 69f151d62f3b..65d65fe23d6e 100644 --- a/trunk/drivers/staging/comedi/drivers/jr3_pci.c +++ b/trunk/drivers/staging/comedi/drivers/jr3_pci.c @@ -360,7 +360,7 @@ static int read_idm_word(const u8 *data, size_t size, int *pos, return result; } -static int jr3_download_firmware(struct comedi_device *dev, const u8 * data, +static int jr3_download_firmware(struct comedi_device *dev, const u8 *data, size_t size) { /* @@ -470,14 +470,13 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s) struct jr3_channel __iomem *channel = p->channel; int errors = get_u16(&channel->errors); - if (errors != p->errors) { + if (errors != p->errors) p->errors = errors; - } - if (errors & (watch_dog | watch_dog2 | sensor_change)) { + + if (errors & (watch_dog | watch_dog2 | sensor_change)) /* Sensor communication lost, force poll mode */ p->state = state_jr3_poll; - } switch (p->state) { case state_jr3_poll: { u16 model_no = get_u16(&channel->model_no);