Merge branch 'next-i2c-mpc-v8' into next-i2c
authorBen Dooks <ben-linux@fluff.org>
Sun, 7 Mar 2010 22:29:13 +0000 (22:29 +0000)
committerBen Dooks <ben-linux@fluff.org>
Sun, 7 Mar 2010 22:29:13 +0000 (22:29 +0000)
drivers/i2c/busses/i2c-pnx.c

index 2b0bd0b..9532dee 100644 (file)
@@ -172,12 +172,6 @@ static int i2c_pnx_master_xmit(struct i2c_pnx_algo_data *alg_data)
                /* We still have something to talk about... */
                val = *alg_data->mif.buf++;
 
-               if (alg_data->mif.len == 1) {
-                       val |= stop_bit;
-                       if (!alg_data->last)
-                               val |= start_bit;
-               }
-
                alg_data->mif.len--;
                iowrite32(val, I2C_REG_TX(alg_data));
 
@@ -251,11 +245,6 @@ static int i2c_pnx_master_rcv(struct i2c_pnx_algo_data *alg_data)
                        __func__);
 
                if (alg_data->mif.len == 1) {
-                       /* Last byte, do not acknowledge next rcv. */
-                       val |= stop_bit;
-                       if (!alg_data->last)
-                               val |= start_bit;
-
                        /*
                         * Enable interrupt RFDAIE (data in Rx fifo),
                         * and disable DRMIE (need data for Tx)