Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

[PATCH] USB: fix visor leaks

Browse source 
This patch fixes blatant leaks in visor driver and makes it report
mode sensible things in ->write_room (this is only needed if your visor
is a terminal though).

It is made to fit into 80 columns with a temporary variable.
Might even save a few instructions...

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Pete Zaitcev 2006-06-21 15:03:40 -07:00 committed by Greg Kroah-Hartman
parent 34f8e76172
commit bd97c4f035
1 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
drivers/usb/serial/visor.c
View file

@ -435,13 +435,25 @@ static int visor_write (struct usb_serial_port *port, const unsigned char *buf,
static int visor_write_room (struct usb_serial_port *port) static int visor_write_room (struct usb_serial_port *port)
{ {
struct visor_private *priv = usb_get_serial_port_data(port);
unsigned long flags;
dbg("%s - port %d", __FUNCTION__, port->number); dbg("%s - port %d", __FUNCTION__, port->number);
/* /*
* We really can take anything the user throws at us * We really can take anything the user throws at us
* but let's pick a nice big number to tell the tty * but let's pick a nice big number to tell the tty
* layer that we have lots of free space * layer that we have lots of free space, unless we don't.
*/ */
spin_lock_irqsave(&priv->lock, flags);
if (priv->outstanding_urbs > URB_UPPER_LIMIT * 2 / 3) {
spin_unlock_irqrestore(&priv->lock, flags);
dbg("%s - write limit hit\n", __FUNCTION__);
return 0;
}
spin_unlock_irqrestore(&priv->lock, flags);
return 2048; return 2048;
} }
@ -758,15 +770,22 @@ static int visor_calc_num_ports (struct usb_serial *serial)
static int generic_startup(struct usb_serial *serial) static int generic_startup(struct usb_serial *serial)
{ {
struct usb_serial_port **ports = serial->port;
struct visor_private *priv; struct visor_private *priv;
int i; int i;
for (i = 0; i < serial->num_ports; ++i) { for (i = 0; i < serial->num_ports; ++i) {
priv = kzalloc (sizeof(*priv), GFP_KERNEL); priv = kzalloc (sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv) {
while (i-- != 0) {
priv = usb_get_serial_port_data(ports[i]);
usb_set_serial_port_data(ports[i], NULL);
kfree(priv);
}
return -ENOMEM; return -ENOMEM;
}
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);
usb_set_serial_port_data(serial->port[i], priv); usb_set_serial_port_data(ports[i], priv);
} }
return 0; return 0;
} }
@ -876,7 +895,18 @@ static int clie_5_attach (struct usb_serial *serial)
static void visor_shutdown (struct usb_serial *serial) static void visor_shutdown (struct usb_serial *serial)
{ {
struct visor_private *priv;
int i;
dbg("%s", __FUNCTION__); dbg("%s", __FUNCTION__);
for (i = 0; i < serial->num_ports; i++) {
priv = usb_get_serial_port_data(serial->port[i]);
if (priv) {
usb_set_serial_port_data(serial->port[i], NULL);
kfree(priv);
}
}
} }
static int visor_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg) static int visor_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg)