Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338476
b: refs/heads/master
c: a321846
h: refs/heads/master
v: v3
  • Loading branch information
Peter Hurley authored and Greg Kroah-Hartman committed Nov 28, 2012
1 parent a1748b7 commit efb91c9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 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: eef6e7b286e6dcf39a9b8c1d31477ee489451a8a
refs/heads/master: a321846492f9ce3bab27f826e6579217fbc35732
5 changes: 4 additions & 1 deletion trunk/drivers/staging/fwserial/fwserial.c
Original file line number Diff line number Diff line change
Expand Up @@ -955,6 +955,7 @@ static void fwserial_destroy(struct kref *kref)
for (j = 0; j < num_ports; ++j) {
fw_core_remove_address_handler(&ports[j]->rx_handler);
dma_fifo_free(&ports[j]->tx_fifo);
tty_port_destroy(&ports[j]->port);
kfree(ports[j]);
}
kfree(serial);
Expand Down Expand Up @@ -2369,8 +2370,10 @@ static int fwserial_create(struct fw_unit *unit)
return err;

free_ports:
for (--i; i >= 0; --i)
for (--i; i >= 0; --i) {
tty_port_destroy(&serial->ports[i]->port);
kfree(serial->ports[i]);
}
kfree(serial);
return err;
}
Expand Down

0 comments on commit efb91c9

Please sign in to comment.