2014-06-28 12:45:54

by Fabian Frédérick

Subject: [PATCH 1/1] drivers/usb/serial/mos7840.c: remove unnecessary null test before kfree

Cc: Johan Hovold <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/usb/serial/mos7840.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 393be56..3d88eef 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1181,10 +1181,7 @@ static void mos7840_close(struct usb_serial_port *port)
/* Freeing Write URBs */
for (j = 0; j < NUM_URBS; ++j) {
if (mos7840_port->write_urb_pool[j]) {
- if (mos7840_port->write_urb_pool[j]->transfer_buffer)
- kfree(mos7840_port->write_urb_pool[j]->
- transfer_buffer);
-
+ kfree(mos7840_port->write_urb_pool[j]->transfer_buffer);
usb_free_urb(mos7840_port->write_urb_pool[j]);
}
}
--
1.8.4.5

2014-07-07 08:24:00

by Johan Hovold

Subject: Re: [PATCH 1/1] drivers/usb/serial/mos7840.c: remove unnecessary null test before kfree

On Sat, Jun 28, 2014 at 02:44:09PM +0200, Fabian Frederick wrote:
> Cc: Johan Hovold <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: [email protected]
> Signed-off-by: Fabian Frederick <[email protected]>

Applied, thanks.

Johan

> ---
> drivers/usb/serial/mos7840.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
> index 393be56..3d88eef 100644
> --- a/drivers/usb/serial/mos7840.c
> +++ b/drivers/usb/serial/mos7840.c
> @@ -1181,10 +1181,7 @@ static void mos7840_close(struct usb_serial_port *port)
> /* Freeing Write URBs */
> for (j = 0; j < NUM_URBS; ++j) {
> if (mos7840_port->write_urb_pool[j]) {
> - if (mos7840_port->write_urb_pool[j]->transfer_buffer)
> - kfree(mos7840_port->write_urb_pool[j]->
> - transfer_buffer);
> -
> + kfree(mos7840_port->write_urb_pool[j]->transfer_buffer);
> usb_free_urb(mos7840_port->write_urb_pool[j]);
> }
> }