]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
[media] ddbridge: fix wait_event_timeout return handling
authorNicholas Mc Guire <hofrat@osadl.org>
Wed, 10 Jun 2015 07:40:02 +0000 (04:40 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Wed, 18 Nov 2015 14:21:29 +0000 (12:21 -0200)
API conformance testing for completions with coccinelle spatches are being
used to locate API usage inconsistencies:
./drivers/media/pci/ddbridge/ddbridge-core.c:89
        incorrect check for negative return

Return type of wait_event_timeout is signed long not int and the
return type is >=0 always thus the negative check is unnecessary..
As stat is used here exclusively its type is simply changed and the
negative return check dropped.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/pci/ddbridge/ddbridge-core.c

index 0ac2dd35fe506480d5e99475bc9200fa26147408..fba5b40a869c50a705d74f5831436f139d08c27e 100644 (file)
@@ -81,13 +81,13 @@ static int i2c_read_reg16(struct i2c_adapter *adapter, u8 adr,
 static int ddb_i2c_cmd(struct ddb_i2c *i2c, u32 adr, u32 cmd)
 {
        struct ddb *dev = i2c->dev;
-       int stat;
+       long stat;
        u32 val;
 
        i2c->done = 0;
        ddbwritel((adr << 9) | cmd, i2c->regs + I2C_COMMAND);
        stat = wait_event_timeout(i2c->wq, i2c->done == 1, HZ);
-       if (stat <= 0) {
+       if (stat == 0) {
                printk(KERN_ERR "I2C timeout\n");
                { /* MSI debugging*/
                        u32 istat = ddbreadl(INTERRUPT_STATUS);