Am Freitag, 20. November 2009 22:44:16 schrieb Greg KH:
> On Fri, Nov 20, 2009 at 10:32:23PM +0100, Oliver Neukum wrote:
> > Am Freitag, 20. November 2009 21:04:54 schrieb Greg KH:
> > > Care to fix them up first? Otherwise I can't accept this patch.
> >
> > I submitted patches to do so. It is possible they ended up in
> > other trees but not yours. Do you want me to resubmit?
>
> Probably, as I see the errors in the drivers/net/usb and wimax subdirs.
> Can you resend them to me, so that I can at least build my tree? When
> it comes to merge time, I'll defer to David Miller to take them.
Here they come.
Regards
Oliver
commit d8ed4fdac5d8ecb35f2669c80ecee8414defb743
Author: Oliver Neukum <oliver@xxxxxxxxxx>
Date: Wed Aug 19 21:26:43 2009 +0200
usb: remove unneeded power primitive
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index cfdaf69..8074e15 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -410,7 +410,6 @@ int i2400mu_probe(struct usb_interface *iface,
#ifdef CONFIG_PM
iface->needs_remote_wakeup = 1; /* autosuspend (15s delay) */
device_init_wakeup(dev, 1);
- usb_autopm_enable(i2400mu->usb_iface);
usb_dev->autosuspend_delay = 15 * HZ;
usb_dev->autosuspend_disabled = 0;
#endif
commit eeada72856087eb90e8649692b75e5b875ba051d
Author: Oliver Neukum <oliver@xxxxxxxxxx>
Date: Wed Aug 19 20:31:56 2009 +0200
usb: remove unneeded power management primitive
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index b154bd9..0b996ea 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -1400,7 +1400,6 @@ static int stk_camera_probe(struct usb_interface *interface,
}
stk_create_sysfs_files(&dev->vdev);
- usb_autopm_enable(dev->interface);
return 0;
commit eb6ea8b517c6390e85585aa3f24483840296487e
Author: Oliver Neukum <oliver@xxxxxxxxxx>
Date: Wed Aug 19 20:27:42 2009 +0200
usb: remove rare pm primitive for conversion to new API
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 1f9ec29..6db2c70 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -721,7 +721,7 @@ static int kaweth_open(struct net_device *net)
return 0;
err_out:
- usb_autopm_enable(kaweth->intf);
+ usb_autopm_put_interface(kaweth->intf);
return -EIO;
}
@@ -758,7 +758,7 @@ static int kaweth_close(struct net_device *net)
kaweth->status &= ~KAWETH_STATUS_CLOSING;
- usb_autopm_enable(kaweth->intf);
+ usb_autopm_put_interface(kaweth->intf);
return 0;
}
