Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205721
b: refs/heads/master
c: e54d9eb
h: refs/heads/master
i:
  205719: ce37691
v: v3
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed Jun 22, 2010
1 parent 82af8d0 commit d907c05
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 79566eb2df013f0ed20e548f4be0f8afbe78f9a3
refs/heads/master: e54d9eb95134120e992ed24ae895ff5b4f87a83e
41 changes: 20 additions & 21 deletions trunk/drivers/staging/vt6656/main_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -718,33 +718,32 @@ static BOOL device_release_WPADEV(PSDevice pDevice)

static int vt6656_suspend(struct usb_interface *intf, pm_message_t message)
{
PSDevice pDevice = usb_get_intfdata(intf);
struct net_device *dev = pDevice->dev;
PSDevice device = usb_get_intfdata(intf);

printk("VNTWUSB Suspend Start======>\n");
if(dev != NULL) {
if(pDevice->flags & DEVICE_FLAGS_OPENED)
device_close(dev);
}
if (!device || !device->dev)
return -ENODEV;

if (device->flags & DEVICE_FLAGS_OPENED)
device_close(device->dev);

usb_put_dev(interface_to_usbdev(intf));

usb_put_dev(interface_to_usbdev(intf));
return 0;
return 0;
}

static int vt6656_resume(struct usb_interface *intf)
{
PSDevice pDevice = usb_get_intfdata(intf);
struct net_device *dev = pDevice->dev;

printk("VNTWUSB Resume Start======>\n");
if(dev != NULL) {
usb_get_dev(interface_to_usbdev(intf));
if(!(pDevice->flags & DEVICE_FLAGS_OPENED)) {
if(device_open(dev)!=0)
printk("VNTWUSB Resume Start======>open fail\n");
}
}
return 0;
PSDevice device = usb_get_intfdata(intf);

if (!device || !device->dev)
return -ENODEV;

usb_get_dev(interface_to_usbdev(intf));

if (!(device->flags & DEVICE_FLAGS_OPENED))
device_open(device->dev);

return 0;
}

#endif /* CONFIG_PM */
Expand Down

0 comments on commit d907c05

Please sign in to comment.