diff options
| author | Lukas Gorris <lukas.gorris@gmail.com> | 2009-03-30 21:20:14 +0200 |
|---|---|---|
| committer | Lukas Gorris <lukas.gorris@gmail.com> | 2009-03-30 21:20:14 +0200 |
| commit | a93dfebb9e7a34ffba9b1ae5e8e496dfab4c3c43 (patch) | |
| tree | 6c38a4617c92398269e6603a0509fc3006811368 /recipes/librfid/files/soos02-check-errors.patch | |
| parent | 4255898da29e7e0c521d064afedbc4075b3e8155 (diff) | |
| parent | d7fdcef3d8c8b80926d579c2db179b594429cebe (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/librfid/files/soos02-check-errors.patch')
| -rw-r--r-- | recipes/librfid/files/soos02-check-errors.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/recipes/librfid/files/soos02-check-errors.patch b/recipes/librfid/files/soos02-check-errors.patch new file mode 100644 index 0000000000..6c40516336 --- /dev/null +++ b/recipes/librfid/files/soos02-check-errors.patch @@ -0,0 +1,36 @@ +diff --git a/src/rfid_asic_rc632.c b/src/rfid_asic_rc632.c +index b9b1aff..f0948c6 100644 +--- a/src/rfid_asic_rc632.c ++++ b/src/rfid_asic_rc632.c +@@ -297,7 +297,9 @@ static int rc632_wait_idle_timer(struct rfid_asic_handle *handle) + DEBUGP_STATUS_FLAG(stat); + if (stat & RC632_STAT_ERR) { + u_int8_t err; +- rc632_reg_read(handle, RC632_REG_ERROR_FLAG, &err); ++ ret = rc632_reg_read(handle, RC632_REG_ERROR_FLAG, &err); ++ if (ret < 0) ++ return ret; + DEBUGP_ERROR_FLAG(err); + if (err & (RC632_ERR_FLAG_COL_ERR | + RC632_ERR_FLAG_PARITY_ERR | +@@ -457,14 +459,16 @@ rc632_transceive(struct rfid_asic_handle *handle, + + + ret = rc632_reg_write(handle, RC632_REG_COMMAND, RC632_CMD_IDLE); ++ if (ret < 0) ++ return ret; + /* clear all interrupts */ +- rc632_clear_spec_bits(handle, RC632_REG_INTERRUPT_RQ, RC632_INT_ALL); ++ ret = rc632_clear_spec_bits(handle, RC632_REG_INTERRUPT_RQ, RC632_INT_ALL); ++ if (ret < 0) ++ return ret; + + { u_int8_t tmp; + rc632_reg_read(handle, RC632_REG_PRIMARY_STATUS, &tmp); + DEBUGP_STATUS_FLAG(tmp); +- rc632_reg_read(handle, RC632_REG_PRIMARY_STATUS, &tmp); +- DEBUGP_STATUS_FLAG(tmp); + rc632_reg_read(handle, RC632_REG_ERROR_FLAG, &tmp); + DEBUGP_ERROR_FLAG(tmp); + } + |