OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: option: fix memory leak
[android-x86/kernel.git]
/
drivers
/
usb
/
serial
/
option.c
diff --git
a/drivers/usb/serial/option.c
b/drivers/usb/serial/option.c
index
9c2f7b2
..
d12ee2f
100644
(file)
--- a/
drivers/usb/serial/option.c
+++ b/
drivers/usb/serial/option.c
@@
-47,6
+47,7
@@
/* Function prototypes */
static int option_probe(struct usb_serial *serial,
const struct usb_device_id *id);
/* Function prototypes */
static int option_probe(struct usb_serial *serial,
const struct usb_device_id *id);
+static void option_release(struct usb_serial *serial);
static int option_send_setup(struct usb_serial_port *port);
static void option_instat_callback(struct urb *urb);
static int option_send_setup(struct usb_serial_port *port);
static void option_instat_callback(struct urb *urb);
@@
-1251,7
+1252,7
@@
static struct usb_serial_driver option_1port_device = {
.ioctl = usb_wwan_ioctl,
.attach = usb_wwan_startup,
.disconnect = usb_wwan_disconnect,
.ioctl = usb_wwan_ioctl,
.attach = usb_wwan_startup,
.disconnect = usb_wwan_disconnect,
- .release =
usb_wwa
n_release,
+ .release =
optio
n_release,
.read_int_callback = option_instat_callback,
#ifdef CONFIG_PM
.suspend = usb_wwan_suspend,
.read_int_callback = option_instat_callback,
#ifdef CONFIG_PM
.suspend = usb_wwan_suspend,
@@
-1333,6
+1334,15
@@
static int option_probe(struct usb_serial *serial,
return 0;
}
return 0;
}
+static void option_release(struct usb_serial *serial)
+{
+ struct usb_wwan_intf_private *priv = usb_get_serial_data(serial);
+
+ usb_wwan_release(serial);
+
+ kfree(priv);
+}
+
static void option_instat_callback(struct urb *urb)
{
int err;
static void option_instat_callback(struct urb *urb)
{
int err;