Re: ixp4xx compile error (was Re: 2.6.21-mm2)

[Frederik Deweerdt <deweerdt@free.fr>]

On Thu, May 10, 2007 at 02:21:29PM +0200, Frederik Deweerdt wrote:
> On Wed, May 09, 2007 at 01:23:22AM -0700, Andrew Morton wrote:
> > 
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.21/2.6.21-mm2/
> > 
> Hi all,
> 
> I've got this compile error while building arm ipx4xx:
> 
>   CC [M]  drivers/input/misc/ixp4xx-beeper.o
> drivers/input/misc/ixp4xx-beeper.c: In function 'ixp4xx_spkr_event':
> drivers/input/misc/ixp4xx-beeper.c:54: error: 'input_dev' undeclared (first use in this function)
> drivers/input/misc/ixp4xx-beeper.c:54: error: (Each undeclared identifier is reported only once
> drivers/input/misc/ixp4xx-beeper.c:54: error: for each function it appears in.)
> make[3]: *** [drivers/input/misc/ixp4xx-beeper.o] Error 1
> make[2]: *** [drivers/input/misc] Error 2
> make[1]: *** [drivers/input] Error 2
> make: *** [drivers] Error 2
> 
> Following patch fixes the problem.

Err, got it backwards. Here's the correct fix:

Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>

--- drivers/input/misc/ixp4xx-beeper.c.ori	2007-05-10 07:59:56.000000000 +0200
+++ drivers/input/misc/ixp4xx-beeper.c	2007-05-10 08:00:53.000000000 +0200
@@ -51,7 +51,7 @@
 
 static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
-	unsigned int pin = (unsigned int) input_get_drvdata(input_dev);
+	unsigned int pin = (unsigned int) input_get_drvdata(dev);
 	unsigned int count = 0;
 
 	if (type != EV_SND)