2005-05-06 23:45:36

by Jesper Juhl

Subject: [PATCH] remove pointless NULL check before kfree in sony535.c

There's no need to check for NULL, kfree() can cope.

Signed-off-by: Jesper Juhl <[email protected]>
---

drivers/cdrom/sonycd535.c | 1 -
1 files changed, 1 deletion(-)

--- linux-2.6.12-rc3-mm3-orig/drivers/cdrom/sonycd535.c 2005-03-02 08:38:37.000000000 +0100
+++ linux-2.6.12-rc3-mm3/drivers/cdrom/sonycd535.c 2005-05-07 01:13:30.000000000 +0200
@@ -1605,7 +1605,6 @@ out7:
put_disk(cdu_disk);
out6:
for (i = 0; i < sony_buffer_sectors; i++)
- if (sony_buffer[i])
kfree(sony_buffer[i]);
out5:
kfree(sony_buffer);

2005-05-07 00:01:17

by Dave Jones

Subject: Re: [PATCH] remove pointless NULL check before kfree in sony535.c

On Sat, May 07, 2005 at 01:19:01AM +0200, Jesper Juhl wrote:
> --- linux-2.6.12-rc3-mm3-orig/drivers/cdrom/sonycd535.c 2005-03-02 08:38:37.000000000 +0100
> +++ linux-2.6.12-rc3-mm3/drivers/cdrom/sonycd535.c 2005-05-07 01:13:30.000000000 +0200
> @@ -1605,7 +1605,6 @@ out7:
> put_disk(cdu_disk);
> out6:
> for (i = 0; i < sony_buffer_sectors; i++)
> - if (sony_buffer[i])
> kfree(sony_buffer[i]);
> out5:

This breaks the indentation.

Dave

2005-05-07 00:03:15

by Jesper Juhl

Subject: Re: [PATCH] remove pointless NULL check before kfree in sony535.c

On Fri, 6 May 2005, Dave Jones wrote:

> On Sat, May 07, 2005 at 01:19:01AM +0200, Jesper Juhl wrote:
> > --- linux-2.6.12-rc3-mm3-orig/drivers/cdrom/sonycd535.c 2005-03-02 08:38:37.000000000 +0100
> > +++ linux-2.6.12-rc3-mm3/drivers/cdrom/sonycd535.c 2005-05-07 01:13:30.000000000 +0200
> > @@ -1605,7 +1605,6 @@ out7:
> > put_disk(cdu_disk);
> > out6:
> > for (i = 0; i < sony_buffer_sectors; i++)
> > - if (sony_buffer[i])
> > kfree(sony_buffer[i]);
> > out5:
>
> This breaks the indentation.
>

Right you are. Sorry about that. Fixed patch below.


Signed-off-by: Jesper Juhl <[email protected]>

--- linux-2.6.12-rc3-mm3-orig/drivers/cdrom/sonycd535.c 2005-03-02 08:38:37.000000000 +0100
+++ linux-2.6.12-rc3-mm3/drivers/cdrom/sonycd535.c 2005-05-07 02:04:45.000000000 +0200
@@ -1605,8 +1605,7 @@ out7:
put_disk(cdu_disk);
out6:
for (i = 0; i < sony_buffer_sectors; i++)
- if (sony_buffer[i])
- kfree(sony_buffer[i]);
+ kfree(sony_buffer[i]);
out5:
kfree(sony_buffer);
out4: