Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1048 → Rev 1049

/shark/trunk/drivers/usb/core/message.c
26,7 → 26,6
 
static void usb_api_blocking_completion(struct urb *urb, struct pt_regs *regs)
{
//printk(KERN_INFO "api\n");
complete((struct completion *)urb->context);
}
 
50,8 → 49,6
struct completion done;
struct timer_list timer;
int status;
struct pt_regs *regs;
 
init_completion(&done);
urb->context = &done;
318,15 → 315,6
int urb_flags;
int dma;
 
{
int i;
for (i=0; i<20; i++)
{
wait_ms26(300);
printk(KERN_INFO "usb_sg_init!!!!!!!\n");
}
}
 
if (!io || !dev || !sg
|| usb_pipecontrol (pipe)
|| usb_pipeisoc (pipe)
1115,7 → 1103,8
goto out;
 
dev->actconfig = cp;
if (!configuration)
//** if (!configuration) 2.6.1
if (!cp)
dev->state = USB_STATE_ADDRESS;
else {
dev->state = USB_STATE_CONFIGURED;