1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 8ee6cd4da9e7..8dbad1ec53c4 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -133,14 +133,17 @@ static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num
 
         for (i = 0; i < num; i++) {
                 /* write/read request */
-                if (i+1 < num && (msg[i+1].flags & I2C_M_RD)) {
+                if (i+1 < num && (msg[i].flags & I2C_M_RD) == 0
+                                          && (msg[i+1].flags & I2C_M_RD)) {
                         if (dibusb_i2c_msg(d, msg[i].addr, msg[i].buf,msg[i].len,
                                                 msg[i+1].buf,msg[i+1].len) < 0)
                                 break;
                         i++;
-                } else
+                } else if ((msg[i].flags & I2C_M_RD) == 0) {
                         if (dibusb_i2c_msg(d, msg[i].addr, msg[i].buf,msg[i].len,NULL,0) < 0)
                                 break;
+                } else
+                        break;
         }
 
         mutex_unlock(&d->i2c_mutex);