Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[linux-2.6] / drivers / input / misc / ixp4xx-beeper.c

diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index 3d4b619dadab98105e383bc5777a2f81fdb2e4a0..e759944041abd7c3a92b0849df88e34e59a47b92 100644 (file)
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -51,7 +51,7 @@ static void ixp4xx_spkr_control(unsigned int pin, unsigned int count)
 
 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)