diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
| commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
| tree | e53c9e39b3149221779c10595bc59fa02de4f45f /drivers/usb/misc/emi62.c | |
| parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
| parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) | |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'drivers/usb/misc/emi62.c')
| -rw-r--r-- | drivers/usb/misc/emi62.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c index 602ee05ba9ff..59860b328534 100644 --- a/drivers/usb/misc/emi62.c +++ b/drivers/usb/misc/emi62.c | |||
| @@ -167,7 +167,7 @@ static int emi62_load_firmware (struct usb_device *dev) | |||
| 167 | err("%s - error loading firmware: error = %d", __func__, err); | 167 | err("%s - error loading firmware: error = %d", __func__, err); |
| 168 | goto wraperr; | 168 | goto wraperr; |
| 169 | } | 169 | } |
| 170 | } while (i > 0); | 170 | } while (rec); |
| 171 | 171 | ||
| 172 | /* Assert reset (stop the CPU in the EMI) */ | 172 | /* Assert reset (stop the CPU in the EMI) */ |
| 173 | err = emi62_set_reset(dev,1); | 173 | err = emi62_set_reset(dev,1); |