diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2012-01-15 08:35:28 +0100 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2012-01-15 08:35:28 +0100 |
| commit | 6528209ba2c94f3a0ef946b7d808d9a15b30ec50 (patch) | |
| tree | c3c1b8bcf8ae19f411c53c2f199f923742bcc256 /drivers/usb/class/cdc-acm.c | |
| parent | a056fb3687c40b8a1123de1586f491285cb5fb1f (diff) | |
| parent | f2ab2a127d480ee20caf8620440ccf13c014447a (diff) | |
Merge remote branch 'stable/linux-2.6.32.y' into 2.6.32-mantismedia/2.6.32-mantis
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index cec9bff8549..653f8530976 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1264,6 +1264,8 @@ made_compressed_probe: i = device_create_file(&intf->dev, &dev_attr_wCountryCodes); if (i < 0) { kfree(acm->country_codes); + acm->country_codes = NULL; + acm->country_code_size = 0; goto skip_countries; } @@ -1272,6 +1274,8 @@ made_compressed_probe: if (i < 0) { device_remove_file(&intf->dev, &dev_attr_wCountryCodes); kfree(acm->country_codes); + acm->country_codes = NULL; + acm->country_code_size = 0; goto skip_countries; } } |