From 896db3dae065b79fd19dfa43011fcdccf1c4356f Mon Sep 17 00:00:00 2001 From: Shinya Kuribayashi Date: Fri, 6 Nov 2009 21:50:22 +0900 Subject: [PATCH] --- yaml --- r: 173860 b: refs/heads/master c: 41c4e35037337cfcd297322f3f60770955156683 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-designware.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ced53d38ef15..6ab37da0061b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52d7e430cff3f076d5ae5587e94f2e9b832b85d2 +refs/heads/master: 41c4e35037337cfcd297322f3f60770955156683 diff --git a/trunk/drivers/i2c/busses/i2c-designware.c b/trunk/drivers/i2c/busses/i2c-designware.c index 5ba7e55eb7f4..5a3bd74c81d5 100644 --- a/trunk/drivers/i2c/busses/i2c-designware.c +++ b/trunk/drivers/i2c/busses/i2c-designware.c @@ -419,7 +419,6 @@ static void i2c_dw_read(struct dw_i2c_dev *dev) { struct i2c_msg *msgs = dev->msgs; - u32 addr = msgs[dev->msg_read_idx].addr; int rx_valid; for (; dev->msg_read_idx < dev->msgs_num; dev->msg_read_idx++) { @@ -429,10 +428,6 @@ i2c_dw_read(struct dw_i2c_dev *dev) if (!(msgs[dev->msg_read_idx].flags & I2C_M_RD)) continue; - /* different i2c client, reprogram the i2c adapter */ - if (msgs[dev->msg_read_idx].addr != addr) - return; - if (!(dev->status & STATUS_READ_IN_PROGRESS)) { len = msgs[dev->msg_read_idx].len; buf = msgs[dev->msg_read_idx].buf;