[PATCH] atyfb: Fix power management

[PATCH] atyfb: Fix power management

[Benjamin Herrenschmidt]

Hi !

The PM code in atyfb got broken in the recent update. This is just a typo though,
here's a fix:

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Index: linux-work/drivers/video/aty/atyfb_base.c
===================================================================
--- linux-work.orig/drivers/video/aty/atyfb_base.c	2004-11-03 14:13:10.319998376 +1100
+++ linux-work/drivers/video/aty/atyfb_base.c	2004-11-03 14:13:45.491651472 +1100
@@ -2015,7 +2015,7 @@
 	}
 	mdelay(500);
 
-	return timeout ? -1 : 0;
+	return timeout ? 0 : -EIO;
 }
 
 static int atyfb_pci_suspend(struct pci_dev *pdev, u32 state)




-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click

Re: [PATCH] atyfb: Fix power management

[Linus Torvalds]

On Wed, 3 Nov 2004, Benjamin Herrenschmidt wrote:
> 
> The PM code in atyfb got broken in the recent update. This is just a typo though,
> here's a fix:

Ok, this comment makes no sense. Which is it? It's certainly more than a 
typo, you're literally changing the return value behaviour to be the 
reverse of what it was.

Now, I think your fix is right, but your checkin comment doesn't make any 
sense. Can you phrase that better?

		Linus

> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> 
> Index: linux-work/drivers/video/aty/atyfb_base.c
> ===================================================================
> --- linux-work.orig/drivers/video/aty/atyfb_base.c	2004-11-03 14:13:10.319998376 +1100
> +++ linux-work/drivers/video/aty/atyfb_base.c	2004-11-03 14:13:45.491651472 +1100
> @@ -2015,7 +2015,7 @@
>  	}
>  	mdelay(500);
>  
> -	return timeout ? -1 : 0;
> +	return timeout ? 0 : -EIO;
>  }
>  
>  static int atyfb_pci_suspend(struct pci_dev *pdev, u32 state)
> 


-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click

Re: [PATCH] atyfb: Fix power management

[Benjamin Herrenschmidt]

On Tue, 2004-11-02 at 19:47 -0800, Linus Torvalds wrote:
> 
> On Wed, 3 Nov 2004, Benjamin Herrenschmidt wrote:
> > 
> > The PM code in atyfb got broken in the recent update. This is just a typo though,
> > here's a fix:
> 
> Ok, this comment makes no sense. Which is it? It's certainly more than a 
> typo, you're literally changing the return value behaviour to be the 
> reverse of what it was.
> 
> Now, I think your fix is right, but your checkin comment doesn't make any 
> sense. Can you phrase that better?

Hrm... It's actually a typo/thinko when going from the "old style" pmac
notifiers to the new PCI based code, I think it may even be me doing it
a long time ago when I submitted a lot of atyfb updates to the fbdev tree.
(I wrote that PM code)

Anyway, here's a better comment:

----

The new atyfb has the return value for the Power Management routine
wrong. This prevents sleep from working on PowerBooks with mach64
video chips. This fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Index: linux-work/drivers/video/aty/atyfb_base.c
===================================================================
--- linux-work.orig/drivers/video/aty/atyfb_base.c	2004-11-03 14:13:10.319998376 +1100
+++ linux-work/drivers/video/aty/atyfb_base.c	2004-11-03 14:13:45.491651472 +1100
@@ -2015,7 +2015,7 @@
 	}
 	mdelay(500);
 
-	return timeout ? -1 : 0;
+	return timeout ? 0 : -EIO;
 }
 
 static int atyfb_pci_suspend(struct pci_dev *pdev, u32 state)




-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click