Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / comedi / drivers / s626.c

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 4a87b4b52400a23e9788b39977fd21f2629d13c4..6d89ca0b9cfc9a3c887114b7e58360eeddcc7602 100644 (file)
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2500,7 +2500,8 @@ static int s626_initialize(struct comedi_device *dev)
        for (i = 0; i < 2; i++) {
                writel(S626_I2C_CLKSEL, dev->mmio + S626_P_I2CSTAT);
                s626_mc_enable(dev, S626_MC2_UPLD_IIC, S626_P_MC2);
-               ret = comedi_timeout(dev, NULL, NULL, s626_i2c_handshake_eoc, 0);
+               ret = comedi_timeout(dev, NULL,
+                                    NULL, s626_i2c_handshake_eoc, 0);
                if (ret)
                        return ret;
        }