diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-15 14:57:39 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-15 14:57:39 -0600 |
| commit | 2bc7c85210d75b7a8a7326284b4f608a16f52ffc (patch) | |
| tree | ca306d89f64ceeee92531cc0a9ba5d246d09f044 /drivers/isdn | |
| parent | 12610be33df5563d3f8cb141f231d4dc5b2a317f (diff) | |
| parent | df2212270ce94f12e9caed6ca04c7077672d588e (diff) | |
Merge branch 'gpio/next-tegra' into gpio/next
Conflicts:
drivers/gpio/Kconfig
drivers/gpio/Makefile
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/hardware/mISDN/hfcsusb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c index 3ccbff13eaf..71a8eb6ef71 100644 --- a/drivers/isdn/hardware/mISDN/hfcsusb.c +++ b/drivers/isdn/hardware/mISDN/hfcsusb.c @@ -283,6 +283,7 @@ hfcsusb_ph_info(struct hfcsusb *hw) _queue_data(&dch->dev.D, MPH_INFORMATION_IND, MISDN_ID_ANY, sizeof(struct ph_info_dch) + dch->dev.nrbchan * sizeof(struct ph_info_ch), phi, GFP_ATOMIC); + kfree(phi); } /* |