Hi,
another one for kzalloc. This covers the storage subdirectory.
Regards
Oliver
Signed-off-by: Oliver Neukum <[EMAIL PROTECTED]>
--- linux-2.6.15-vanilla/drivers/usb/storage/datafab.c 2006-01-03
04:21:10.000000000 +0100
+++ linux-2.6.15/drivers/usb/storage/datafab.c 2006-01-06 23:20:49.000000000
+0100
@@ -512,13 +512,12 @@
};
if (!us->extra) {
- us->extra = kmalloc(sizeof(struct datafab_info), GFP_NOIO);
+ us->extra = kzalloc(sizeof(struct datafab_info), GFP_NOIO);
if (!us->extra) {
US_DEBUGP("datafab_transport: Gah! "
"Can't allocate storage for Datafab info
struct!\n");
return USB_STOR_TRANSPORT_ERROR;
}
- memset(us->extra, 0, sizeof(struct datafab_info));
us->extra_destructor = datafab_info_destructor;
((struct datafab_info *)us->extra)->lun = -1;
}
--- linux-2.6.15-vanilla/drivers/usb/storage/isd200.c 2006-01-03
04:21:10.000000000 +0100
+++ linux-2.6.15/drivers/usb/storage/isd200.c 2006-01-06 23:20:06.000000000
+0100
@@ -1361,21 +1361,19 @@
struct isd200_info *info;
info = (struct isd200_info *)
- kmalloc(sizeof(struct isd200_info), GFP_KERNEL);
+ kzalloc(sizeof(struct isd200_info), GFP_KERNEL);
if (!info)
retStatus = ISD200_ERROR;
else {
- memset(info, 0, sizeof(struct isd200_info));
info->id = (struct hd_driveid *)
- kmalloc(sizeof(struct hd_driveid), GFP_KERNEL);
+ kzalloc(sizeof(struct hd_driveid), GFP_KERNEL);
info->RegsBuf = (unsigned char *)
kmalloc(sizeof(info->ATARegs), GFP_KERNEL);
if (!info->id || !info->RegsBuf) {
isd200_free_info_ptrs(info);
kfree(info);
retStatus = ISD200_ERROR;
- } else
- memset(info->id, 0, sizeof(struct hd_driveid));
+ }
}
if (retStatus == ISD200_GOOD) {
--- linux-2.6.15-vanilla/drivers/usb/storage/jumpshot.c 2006-01-03
04:21:10.000000000 +0100
+++ linux-2.6.15/drivers/usb/storage/jumpshot.c 2006-01-06 23:17:40.000000000
+0100
@@ -441,12 +441,11 @@
};
if (!us->extra) {
- us->extra = kmalloc(sizeof(struct jumpshot_info), GFP_NOIO);
+ us->extra = kzalloc(sizeof(struct jumpshot_info), GFP_NOIO);
if (!us->extra) {
US_DEBUGP("jumpshot_transport: Gah! Can't allocate
storage for jumpshot info struct!\n");
return USB_STOR_TRANSPORT_ERROR;
}
- memset(us->extra, 0, sizeof(struct jumpshot_info));
us->extra_destructor = jumpshot_info_destructor;
}
--- linux-2.6.15-vanilla/drivers/usb/storage/sddr09.c 2006-01-03
04:21:10.000000000 +0100
+++ linux-2.6.15/drivers/usb/storage/sddr09.c 2006-01-06 23:17:04.000000000
+0100
@@ -1345,9 +1345,8 @@
static void
sddr09_init_card_info(struct us_data *us) {
if (!us->extra) {
- us->extra = kmalloc(sizeof(struct sddr09_card_info), GFP_NOIO);
+ us->extra = kzalloc(sizeof(struct sddr09_card_info), GFP_NOIO);
if (us->extra) {
- memset(us->extra, 0, sizeof(struct sddr09_card_info));
us->extra_destructor = sddr09_card_info_destructor;
}
}
--- linux-2.6.15-vanilla/drivers/usb/storage/sddr55.c 2006-01-03
04:21:10.000000000 +0100
+++ linux-2.6.15/drivers/usb/storage/sddr55.c 2006-01-06 23:16:10.000000000
+0100
@@ -751,11 +751,10 @@
struct sddr55_card_info *info;
if (!us->extra) {
- us->extra = kmalloc(
+ us->extra = kzalloc(
sizeof(struct sddr55_card_info), GFP_NOIO);
if (!us->extra)
return USB_STOR_TRANSPORT_ERROR;
- memset(us->extra, 0, sizeof(struct sddr55_card_info));
us->extra_destructor = sddr55_card_info_destructor;
}
--- linux-2.6.15-vanilla/drivers/usb/storage/shuttle_usbat.c 2006-01-03
04:21:10.000000000 +0100
+++ linux-2.6.15/drivers/usb/storage/shuttle_usbat.c 2006-01-06
23:15:06.000000000 +0100
@@ -1318,12 +1318,11 @@
unsigned char subcountL = USBAT_ATA_LBA_ME;
unsigned char *status = us->iobuf;
- us->extra = kmalloc(sizeof(struct usbat_info), GFP_NOIO);
+ us->extra = kzalloc(sizeof(struct usbat_info), GFP_NOIO);
if (!us->extra) {
US_DEBUGP("init_usbat: Gah! Can't allocate storage for usbat
info struct!\n");
return 1;
}
- memset(us->extra, 0, sizeof(struct usbat_info));
info = (struct usbat_info *) (us->extra);
/* Enable peripheral control signals */
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
