i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmetical change only: don't shadow the "buffer" parameter with the local

Browse Source 
variable. Didn't matter, as the parameter is only accessed through the
usb_raw_command variable that it is casted to early in the function. CID 5219.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39906 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2010-12-21 00:06:16 +00:00
parent 1579900f55
commit 3d7bd2dc23
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/bus/usb/usb_raw.cpp
+6 -6
View File
@@ -494,8 +494,8 @@ usb_raw_ioctl(void *cookie, uint32 op, void *buffer, size_t length)
} }
uint8 length = MIN(firstTwoBytes[0], command->descriptor.length); uint8 length = MIN(firstTwoBytes[0], command->descriptor.length);
uint8 *buffer = (uint8 *)malloc(length); uint8 *descriptorBuffer = (uint8 *)malloc(length);
if (!buffer) { if (descriptorBuffer == NULL) {
command->descriptor.status = B_USB_RAW_STATUS_ABORTED; command->descriptor.status = B_USB_RAW_STATUS_ABORTED;
command->descriptor.length = 0; command->descriptor.length = 0;
return B_NO_MEMORY; return B_NO_MEMORY;
@@ -503,19 +503,19 @@ usb_raw_ioctl(void *cookie, uint32 op, void *buffer, size_t length)
if (gUSBModule->get_descriptor(device->device, if (gUSBModule->get_descriptor(device->device,
command->descriptor.type, command->descriptor.index, command->descriptor.type, command->descriptor.index,
command->descriptor.language_id, buffer, length, command->descriptor.language_id, descriptorBuffer, length,
&actualLength) < B_OK &actualLength) < B_OK
|| actualLength != length) { || actualLength != length) {
command->descriptor.status = B_USB_RAW_STATUS_ABORTED; command->descriptor.status = B_USB_RAW_STATUS_ABORTED;
command->descriptor.length = 0; command->descriptor.length = 0;
free(buffer); free(descriptorBuffer);
return B_OK; return B_OK;
} }
memcpy(command->descriptor.data, buffer, length); memcpy(command->descriptor.data, descriptorBuffer, length);
command->descriptor.status = B_USB_RAW_STATUS_SUCCESS; command->descriptor.status = B_USB_RAW_STATUS_SUCCESS;
command->descriptor.length = length; command->descriptor.length = length;
free(buffer); free(descriptorBuffer);
return B_OK; return B_OK;
} }