@@ -443,7 +443,7 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
443
443
acknak (i2c_adap , 0 );
444
444
dev_err (& i2c_adap -> dev , "readbytes: invalid "
445
445
"block length (%d)\n" , inval );
446
- return - EREMOTEIO ;
446
+ return - EPROTO ;
447
447
}
448
448
/* The original count value accounts for the extra
449
449
bytes, that is, either 1 for a regular transaction,
@@ -472,7 +472,7 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
472
472
* reads, writes as well as 10bit-addresses.
473
473
* returns:
474
474
* 0 everything went okay, the chip ack'ed, or IGNORE_NAK flag was set
475
- * -x an error occurred (like: -EREMOTEIO if the device did not answer, or
475
+ * -x an error occurred (like: -ENXIO if the device did not answer, or
476
476
* -ETIMEDOUT, for example if the lines are stuck...)
477
477
*/
478
478
static int bit_doAddress (struct i2c_adapter * i2c_adap , struct i2c_msg * msg )
@@ -495,14 +495,14 @@ static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
495
495
if ((ret != 1 ) && !nak_ok ) {
496
496
dev_err (& i2c_adap -> dev ,
497
497
"died at extended address code\n" );
498
- return - EREMOTEIO ;
498
+ return - ENXIO ;
499
499
}
500
500
/* the remaining 8 bit address */
501
501
ret = i2c_outb (i2c_adap , msg -> addr & 0x7f );
502
502
if ((ret != 1 ) && !nak_ok ) {
503
503
/* the chip did not ack / xmission error occurred */
504
504
dev_err (& i2c_adap -> dev , "died at 2nd address code\n" );
505
- return - EREMOTEIO ;
505
+ return - ENXIO ;
506
506
}
507
507
if (flags & I2C_M_RD ) {
508
508
bit_dbg (3 , & i2c_adap -> dev , "emitting repeated "
@@ -514,7 +514,7 @@ static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
514
514
if ((ret != 1 ) && !nak_ok ) {
515
515
dev_err (& i2c_adap -> dev ,
516
516
"died at repeated address code\n" );
517
- return - EREMOTEIO ;
517
+ return - EIO ;
518
518
}
519
519
}
520
520
} else { /* normal 7bit address */
@@ -572,7 +572,7 @@ static int bit_xfer(struct i2c_adapter *i2c_adap,
572
572
ret , ret == 1 ? "" : "s" );
573
573
if (ret < pmsg -> len ) {
574
574
if (ret >= 0 )
575
- ret = - EREMOTEIO ;
575
+ ret = - EIO ;
576
576
goto bailout ;
577
577
}
578
578
} else {
@@ -583,7 +583,7 @@ static int bit_xfer(struct i2c_adapter *i2c_adap,
583
583
ret , ret == 1 ? "" : "s" );
584
584
if (ret < pmsg -> len ) {
585
585
if (ret >= 0 )
586
- ret = - EREMOTEIO ;
586
+ ret = - EIO ;
587
587
goto bailout ;
588
588
}
589
589
}
0 commit comments