diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-07 11:42:53 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-07 11:42:53 +1100 |
| commit | d6cea57e1a6a22b140abbbda76b79a9fb9d9797c (patch) | |
| tree | d4a9f094756f59f9d5fea3988ced7e5508d64ccb /drivers | |
| parent | 0e51def95d22e3f71d809588e5f3c374ddd81b65 (diff) | |
| parent | 7e2c0463daa5566e8594445ecd0966c2cf247aef (diff) | |
Merge remote branch 'ia64/test'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/ioc3_serial.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c index 93de907b1208..08d77b041bd8 100644 --- a/drivers/serial/ioc3_serial.c +++ b/drivers/serial/ioc3_serial.c @@ -2017,6 +2017,7 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd) struct ioc3_port *port; struct ioc3_port *ports[PORTS_PER_CARD]; int phys_port; + int cnt; DPRINT_CONFIG(("%s (0x%p, 0x%p)\n", __func__, is, idd)); @@ -2146,6 +2147,9 @@ ioc3uart_probe(struct ioc3_submodule *is, struct ioc3_driver_data *idd) /* error exits that give back resources */ out4: + for (cnt = 0; cnt < phys_port; cnt++) + kfree(ports[cnt]); + kfree(card_ptr); return ret; } |