Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 93286
b: refs/heads/master
c: 9544e83
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Morton authored and Greg Kroah-Hartman committed Apr 25, 2008
1 parent d541a57 commit 2c3cb0e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4208978ec4f0d6001facf95be9defccf1a0bf313
refs/heads/master: 9544e833f977d1d3e102a070718d613cd234ce8d
10 changes: 4 additions & 6 deletions trunk/drivers/usb/serial/io_ti.c
Original file line number Diff line number Diff line change
Expand Up @@ -1086,12 +1086,11 @@ static int TIDownloadFirmware (struct edgeport_serial *serial)
if (serial->product_info.TiMode == TI_MODE_DOWNLOAD) {
struct ti_i2c_desc *rom_desc;

dbg ("%s - <<<<<<<<<<<<<<<RUNNING IN DOWNLOAD MODE>>>>>>>>>>", __FUNCTION__);
dbg("%s - RUNNING IN DOWNLOAD MODE", __func__);

status = TiValidateI2cImage (serial);
if (status) {
dbg ("%s - <<<<<<<<<<<<<<<DOWNLOAD MODE -- BAD I2C >>>>>>>>>>",
__FUNCTION__);
dbg("%s - DOWNLOAD MODE -- BAD I2C", __func__);
return status;
}

Expand Down Expand Up @@ -1345,8 +1344,7 @@ static int TIDownloadFirmware (struct edgeport_serial *serial)
/********************************************************************/
/* Boot Mode */
/********************************************************************/
dbg ("%s - <<<<<<<<<<<<<<<RUNNING IN BOOT MODE>>>>>>>>>>>>>>>",
__FUNCTION__);
dbg("%s - RUNNING IN BOOT MODE", __func__);

// Configure the TI device so we can use the BULK pipes for download
status = TIConfigureBootDevice (serial->serial->dev);
Expand Down Expand Up @@ -1461,7 +1459,7 @@ static int TIDownloadFirmware (struct edgeport_serial *serial)

StayInBootMode:
// Eprom is invalid or blank stay in boot mode
dbg ("%s - <<<<<<<<<<<<<<<STAYING IN BOOT MODE>>>>>>>>>>>>", __FUNCTION__);
dbg("%s - STAYING IN BOOT MODE", __func__);
serial->product_info.TiMode = TI_MODE_BOOT;

return 0;
Expand Down

0 comments on commit 2c3cb0e

Please sign in to comment.