git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
scsi
/
sr_vendor.c
diff --git
a/drivers/scsi/sr_vendor.c
b/drivers/scsi/sr_vendor.c
index
9dde8df
..
4eb3da9
100644
(file)
--- a/
drivers/scsi/sr_vendor.c
+++ b/
drivers/scsi/sr_vendor.c
@@
-34,7
+34,6
@@
* HP 6020 writers now supported.
*/
* HP 6020 writers now supported.
*/
-#include <linux/config.h>
#include <linux/cdrom.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/cdrom.h>
#include <linux/errno.h>
#include <linux/string.h>
@@
-118,7
+117,7
@@
int sr_set_blocklength(Scsi_CD *cd, int blocklength)
density = (blocklength > 2048) ? 0x81 : 0x83;
#endif
density = (blocklength > 2048) ? 0x81 : 0x83;
#endif
- buffer =
(unsigned char *)
kmalloc(512, GFP_KERNEL | GFP_DMA);
+ buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
if (!buffer)
return -ENOMEM;
if (!buffer)
return -ENOMEM;
@@
-165,7
+164,7
@@
int sr_cd_check(struct cdrom_device_info *cdi)
if (cd->cdi.mask & CDC_MULTI_SESSION)
return 0;
if (cd->cdi.mask & CDC_MULTI_SESSION)
return 0;
- buffer =
(unsigned char *)
kmalloc(512, GFP_KERNEL | GFP_DMA);
+ buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
if (!buffer)
return -ENOMEM;
if (!buffer)
return -ENOMEM;