diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
| commit | 6bd6dbbd3ae53a268a510270bebaab24fff382ca (patch) | |
| tree | 41d0361e6b48ce74584c9a6fcb475d5054ca4141 /drivers/char/busmouse.c | |
| parent | ee355114ec6062d00c1376b184b886a39e74fd4e (diff) | |
Merge with Linux 2.4.0-test6-pre10.
Diffstat (limited to 'drivers/char/busmouse.c')
| -rw-r--r-- | drivers/char/busmouse.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/drivers/char/busmouse.c b/drivers/char/busmouse.c index 9bfe4b2b3..9a983bb3e 100644 --- a/drivers/char/busmouse.c +++ b/drivers/char/busmouse.c @@ -172,12 +172,10 @@ static int busmouse_release(struct inode *inode, struct file *file) busmouse_fasync(-1, file, 0); if (--mse->active == 0) { - if (mse->ops) { - if (mse->ops->release) - ret = mse->ops->release(inode, file); - if (mse->ops->owner) - __MOD_DEC_USE_COUNT(mse->ops->owner); - } + if (mse->ops->release) + ret = mse->ops->release(inode, file); + if (mse->ops->owner) + __MOD_DEC_USE_COUNT(mse->ops->owner); mse->ready = 0; } unlock_kernel(); @@ -189,7 +187,7 @@ static int busmouse_open(struct inode *inode, struct file *file) { struct busmouse_data *mse; unsigned int mousedev; - int ret = -ENODEV; + int ret; mousedev = DEV_TO_MOUSE(inode->i_rdev); if (mousedev >= NR_MICE) @@ -197,13 +195,15 @@ static int busmouse_open(struct inode *inode, struct file *file) down(&mouse_sem); mse = busmouse_data[mousedev]; - if (!mse) - /* shouldn't happen, but... */ + ret = -ENODEV; + if (!mse || !mse->ops) /* shouldn't happen, but... */ goto end; - - if (mse->ops && mse->ops->owner) - __MOD_INC_USE_COUNT(mse->ops->owner); - if (mse->ops && mse->ops->open) { + + if (mse->ops->owner && !try_inc_mod_count(mse->ops->owner)) + goto end; + + ret = 0; + if (mse->ops->open) { ret = mse->ops->open(inode, file); if (ret && mse->ops->owner) __MOD_DEC_USE_COUNT(mse->ops->owner); @@ -222,10 +222,7 @@ static int busmouse_open(struct inode *inode, struct file *file) mse->ready = 0; mse->dxpos = 0; mse->dypos = 0; - if (mse->ops) - mse->buttons = mse->ops->init_button_state; - else - mse->buttons = 7; + mse->buttons = mse->ops->init_button_state; spin_unlock_irq(&mse->lock); end: |