diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
| commit | b1e50ebcf24668e57f058deb48b0704b5391ed0f (patch) | |
| tree | 17e1b69b249d0738317b732186340c9dd053f1a1 /drivers/firewire | |
| parent | 0c2a2ae32793e3500a15a449612485f5d17dd431 (diff) | |
| parent | 7e125f7b9cbfce4101191b8076d606c517a73066 (diff) | |
Merge remote branch 'origin' into secretlab/next-spi
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/ohci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 94b16e0340ae..a3b083a7403a 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
| @@ -1351,7 +1351,7 @@ static void bus_reset_tasklet(unsigned long data) | |||
| 1351 | * was set up before this reset, the old one is now no longer | 1351 | * was set up before this reset, the old one is now no longer |
| 1352 | * in use and we can free it. Update the config rom pointers | 1352 | * in use and we can free it. Update the config rom pointers |
| 1353 | * to point to the current config rom and clear the | 1353 | * to point to the current config rom and clear the |
| 1354 | * next_config_rom pointer so a new udpate can take place. | 1354 | * next_config_rom pointer so a new update can take place. |
| 1355 | */ | 1355 | */ |
| 1356 | 1356 | ||
| 1357 | if (ohci->next_config_rom != NULL) { | 1357 | if (ohci->next_config_rom != NULL) { |