diff --git a/[refs] b/[refs] index 233665b2d138..da252063a0f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40b798efe3460797a4ac928ee2e038774e2758eb +refs/heads/master: a7e63bb5f08378620d913824ab42e49027f22194 diff --git a/trunk/drivers/char/cs5535_gpio.c b/trunk/drivers/char/cs5535_gpio.c index 04ba906b4880..4d830dc482ef 100644 --- a/trunk/drivers/char/cs5535_gpio.c +++ b/trunk/drivers/char/cs5535_gpio.c @@ -17,7 +17,7 @@ #include #include #include -#include + #include #include @@ -158,7 +158,6 @@ static int cs5535_gpio_open(struct inode *inode, struct file *file) { u32 m = iminor(inode); - cycle_kernel_lock(); /* the mask says which pins are usable by this driver */ if ((mask & (1 << m)) == 0) return -EINVAL;