public inbox for linux-pm@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] PCI: fix incorrect error return in pci_enable_wake
       [not found] <200812112058.08927.rjw@sisk.pl>
@ 2008-12-11 20:11 ` Alan Stern
       [not found] ` <Pine.LNX.4.44L0.0812111510160.15474-100000@iolanthe.rowland.org>
  1 sibling, 0 replies; 6+ messages in thread
From: Alan Stern @ 2008-12-11 20:11 UTC (permalink / raw)
  To: Rafael J. Wysocki, Greg KH; +Cc: pm list, USB list

This patch (as1186) fixes a minor mistake in pci_enable_wake().  When
the routine is asked to disable remote wakeup, it should not return an
error merely because the device is not allowed to do wakeups!

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>

---

Index: usb-2.6/drivers/pci/pci.c
===================================================================
--- usb-2.6.orig/drivers/pci/pci.c
+++ usb-2.6/drivers/pci/pci.c
@@ -1107,7 +1107,7 @@ int pci_enable_wake(struct pci_dev *dev,
 	int error = 0;
 	bool pme_done = false;
 
-	if (!device_may_wakeup(&dev->dev))
+	if (enable && !device_may_wakeup(&dev->dev))
 		return -EINVAL;
 
 	/*

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] PCI: fix incorrect error return in pci_enable_wake
       [not found] ` <Pine.LNX.4.44L0.0812111510160.15474-100000@iolanthe.rowland.org>
@ 2008-12-11 20:19   ` Rafael J. Wysocki
  2008-12-14  9:33   ` Pavel Machek
       [not found]   ` <200812112119.51610.rjw@sisk.pl>
  2 siblings, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2008-12-11 20:19 UTC (permalink / raw)
  To: Alan Stern; +Cc: Greg KH, pm list, USB list, Jesse Barnes

On Thursday, 11 of December 2008, Alan Stern wrote:
> This patch (as1186) fixes a minor mistake in pci_enable_wake().  When
> the routine is asked to disable remote wakeup, it should not return an
> error merely because the device is not allowed to do wakeups!
> 
> Signed-off-by: Alan Stern <stern@rowland.harvard.edu>

Acked-by: Rafael J. Wysocki <rjw@sisk.pl>

[This should go to Jesse, BTW, already CCed.]
> ---
> 
> Index: usb-2.6/drivers/pci/pci.c
> ===================================================================
> --- usb-2.6.orig/drivers/pci/pci.c
> +++ usb-2.6/drivers/pci/pci.c
> @@ -1107,7 +1107,7 @@ int pci_enable_wake(struct pci_dev *dev,
>  	int error = 0;
>  	bool pme_done = false;
>  
> -	if (!device_may_wakeup(&dev->dev))
> +	if (enable && !device_may_wakeup(&dev->dev))
>  		return -EINVAL;
>  
>  	/*

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] PCI: fix incorrect error return in pci_enable_wake
       [not found] ` <Pine.LNX.4.44L0.0812111510160.15474-100000@iolanthe.rowland.org>
  2008-12-11 20:19   ` Rafael J. Wysocki
@ 2008-12-14  9:33   ` Pavel Machek
       [not found]   ` <200812112119.51610.rjw@sisk.pl>
  2 siblings, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2008-12-14  9:33 UTC (permalink / raw)
  To: Alan Stern; +Cc: Greg KH, pm list, USB list

On Thu 2008-12-11 15:11:39, Alan Stern wrote:
> This patch (as1186) fixes a minor mistake in pci_enable_wake().  When
> the routine is asked to disable remote wakeup, it should not return an
> error merely because the device is not allowed to do wakeups!
> 
> Signed-off-by: Alan Stern <stern@rowland.harvard.edu>

Acked-by: Pavel Machek <pavel@suse.cz>

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] PCI: fix incorrect error return in pci_enable_wake
       [not found]   ` <200812112119.51610.rjw@sisk.pl>
@ 2008-12-16 18:43     ` Jesse Barnes
  2008-12-16 19:06       ` Alan Stern
  0 siblings, 1 reply; 6+ messages in thread
From: Jesse Barnes @ 2008-12-16 18:43 UTC (permalink / raw)
  To: Rafael J. Wysocki; +Cc: Greg KH, pm list, USB list

On Thursday, December 11, 2008 12:19 pm Rafael J. Wysocki wrote:
> On Thursday, 11 of December 2008, Alan Stern wrote:
> > This patch (as1186) fixes a minor mistake in pci_enable_wake().  When
> > the routine is asked to disable remote wakeup, it should not return an
> > error merely because the device is not allowed to do wakeups!
> >
> > Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
>
> Acked-by: Rafael J. Wysocki <rjw@sisk.pl>

I lost the original of this one.  Alan can you resend to me with Rafael's ack?

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] PCI: fix incorrect error return in pci_enable_wake
  2008-12-16 18:43     ` Jesse Barnes
@ 2008-12-16 19:06       ` Alan Stern
  0 siblings, 0 replies; 6+ messages in thread
From: Alan Stern @ 2008-12-16 19:06 UTC (permalink / raw)
  To: Jesse Barnes; +Cc: Greg KH, pm list, USB list

This patch (as1186) fixes a minor mistake in pci_enable_wake().  When
the routine is asked to disable remote wakeup, it should not return an
error merely because the device is not allowed to do wakeups!

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>

---
On Tue, 16 Dec 2008, Jesse Barnes wrote:

> I lost the original of this one.  Alan can you resend to me with Rafael's ack?

Here you go.

Alan Stern



Index: usb-2.6/drivers/pci/pci.c
===================================================================
--- usb-2.6.orig/drivers/pci/pci.c
+++ usb-2.6/drivers/pci/pci.c
@@ -1107,7 +1107,7 @@ int pci_enable_wake(struct pci_dev *dev,
 	int error = 0;
 	bool pme_done = false;
 
-	if (!device_may_wakeup(&dev->dev))
+	if (enable && !device_may_wakeup(&dev->dev))
 		return -EINVAL;
 
 	/*

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] PCI: fix incorrect error return in pci_enable_wake
       [not found] <Pine.LNX.4.44L0.0812161404580.6238-100000@iolanthe.rowland.org>
@ 2008-12-16 20:20 ` Jesse Barnes
  0 siblings, 0 replies; 6+ messages in thread
From: Jesse Barnes @ 2008-12-16 20:20 UTC (permalink / raw)
  To: Alan Stern; +Cc: Greg KH, pm list, USB list

On Tuesday, December 16, 2008 11:06 am Alan Stern wrote:
> This patch (as1186) fixes a minor mistake in pci_enable_wake().  When
> the routine is asked to disable remote wakeup, it should not return an
> error merely because the device is not allowed to do wakeups!
>
> Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
> Acked-by: Rafael J. Wysocki <rjw@sisk.pl>

Applied to my linux-next branch, thanks.

-- 
Jesse Barnes, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2008-12-16 20:20 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <200812112058.08927.rjw@sisk.pl>
2008-12-11 20:11 ` [PATCH] PCI: fix incorrect error return in pci_enable_wake Alan Stern
     [not found] ` <Pine.LNX.4.44L0.0812111510160.15474-100000@iolanthe.rowland.org>
2008-12-11 20:19   ` Rafael J. Wysocki
2008-12-14  9:33   ` Pavel Machek
     [not found]   ` <200812112119.51610.rjw@sisk.pl>
2008-12-16 18:43     ` Jesse Barnes
2008-12-16 19:06       ` Alan Stern
     [not found] <Pine.LNX.4.44L0.0812161404580.6238-100000@iolanthe.rowland.org>
2008-12-16 20:20 ` Jesse Barnes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox