diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-21 13:24:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-21 13:24:16 +1000 |
| commit | 1ff6993e0ce901be45b2ea86960b736ab4725c80 (patch) | |
| tree | 48513a787d6adb2b2bdbc81630a73eb7bbd1740a /drivers/net | |
| parent | d060916582ebccf4546cf343d53dc70433eaf2e8 (diff) | |
| parent | 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 (diff) | |
Merge remote branch 'irda/for-next'
Conflicts:
drivers/net/irda/irda-usb.c
Diffstat (limited to 'drivers/net')
| -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 4441fa3389c2..e4e71f32746b 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)) { |