diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /drivers/cdrom/sonycd535.c | |
parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'drivers/cdrom/sonycd535.c')
-rw-r--r-- | drivers/cdrom/sonycd535.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c index f4be7bfd6675..9f22e8f1f6c0 100644 --- a/drivers/cdrom/sonycd535.c +++ b/drivers/cdrom/sonycd535.c | |||
@@ -1605,8 +1605,7 @@ out7: | |||
1605 | put_disk(cdu_disk); | 1605 | put_disk(cdu_disk); |
1606 | out6: | 1606 | out6: |
1607 | for (i = 0; i < sony_buffer_sectors; i++) | 1607 | for (i = 0; i < sony_buffer_sectors; i++) |
1608 | if (sony_buffer[i]) | 1608 | kfree(sony_buffer[i]); |
1609 | kfree(sony_buffer[i]); | ||
1610 | out5: | 1609 | out5: |
1611 | kfree(sony_buffer); | 1610 | kfree(sony_buffer); |
1612 | out4: | 1611 | out4: |