Pull button into test branch

[pandora-kernel.git] / arch / cris / arch-v32 / drivers / gpio.c

diff --git a/arch/cris/arch-v32/drivers/gpio.c b/arch/cris/arch-v32/drivers/gpio.c
index 00e9167..08d36f0 100644 (file)
--- a/arch/cris/arch-v32/drivers/gpio.c
+++ b/arch/cris/arch-v32/drivers/gpio.c
@@ -418,12 +418,12 @@ static int
 gpio_open(struct inode *inode, struct file *filp)
 {
        struct gpio_private *priv;
-       int p = MINOR(inode->i_rdev);
+       int p = iminor(inode);
 
        if (p > GPIO_MINOR_LAST)
                return -EINVAL;
 
-       priv = (struct gpio_private *)kmalloc(sizeof(struct gpio_private),
+       priv = kmalloc(sizeof(struct gpio_private),
                                              GFP_KERNEL);
 
        if (!priv)