diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-06 14:21:59 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-06 14:21:59 +1100 |
| commit | 039eb2cc606eb041f2d0d8d1dce06fb7f431e68f (patch) | |
| tree | 9d8e71bf7362fa97bcdbd5bb7035a11b825269d2 /drivers | |
| parent | 13a0d59f4e226444c32aa536aacbbbd910197f63 (diff) | |
| parent | 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 (diff) | |
Merge remote branch 'irda/for-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/irda/irda-usb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c index 215adf6377d0..5e462b9169ed 100644 --- a/drivers/net/irda/irda-usb.c +++ b/drivers/net/irda/irda-usb.c @@ -1124,11 +1124,12 @@ static int stir421x_patch_device(struct irda_usb_cb *self) * The actual image starts after the "STMP" keyword * so forward to the firmware header tag */ - for (i = 0; (fw->data[i] != STIR421X_PATCH_END_OF_HDR_TAG) - && (i < fw->size); i++) ; + for (i = 0; i < fw->size && fw->data[i] != + STIR421X_PATCH_END_OF_HDR_TAG; i++) + ; /* here we check for the out of buffer case */ - if ((STIR421X_PATCH_END_OF_HDR_TAG == fw->data[i]) - && (i < STIR421X_PATCH_CODE_OFFSET)) { + if (i < STIR421X_PATCH_CODE_OFFSET && i < fw->size && + STIR421X_PATCH_END_OF_HDR_TAG == fw->data[i]) { if (!memcmp(fw->data + i + 1, STIR421X_PATCH_STMP_TAG, sizeof(STIR421X_PATCH_STMP_TAG) - 1)) { |