From ee0eca277f2d88b58c811d13bd7e73f9097c4292 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 8 Oct 2012 09:07:24 -0700 Subject: [PATCH] --- yaml --- r: 334091 b: refs/heads/master c: 3376b8b753bcc300c4f1b170d01c2fb472889a3d h: refs/heads/master i: 334089: 8ce7f94b5b844e2c4b3e3ab8d5ff9cf33c112237 334087: f7970167d98d8bbd629270ba40128c36d462ddeb v: v3 --- [refs] | 2 +- trunk/drivers/input/mousedev.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index c8ca5117f12b..1c741ca79c30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c74585eccbef8fbdac494bfb2abb768aab886d3 +refs/heads/master: 3376b8b753bcc300c4f1b170d01c2fb472889a3d diff --git a/trunk/drivers/input/mousedev.c b/trunk/drivers/input/mousedev.c index 91f622058bab..2baf32d72845 100644 --- a/trunk/drivers/input/mousedev.c +++ b/trunk/drivers/input/mousedev.c @@ -68,7 +68,7 @@ struct mousedev { bool exist; struct list_head mixdev_node; - int mixdev_open; + bool opened_by_mixdev; struct mousedev_hw_data packet; unsigned int pkt_count; @@ -469,11 +469,11 @@ static void mixdev_open_devices(void) return; list_for_each_entry(mousedev, &mousedev_mix_list, mixdev_node) { - if (!mousedev->mixdev_open) { + if (!mousedev->opened_by_mixdev) { if (mousedev_open_device(mousedev)) continue; - mousedev->mixdev_open = 1; + mousedev->opened_by_mixdev = true; } } } @@ -491,8 +491,8 @@ static void mixdev_close_devices(void) return; list_for_each_entry(mousedev, &mousedev_mix_list, mixdev_node) { - if (mousedev->mixdev_open) { - mousedev->mixdev_open = 0; + if (mousedev->opened_by_mixdev) { + mousedev->opened_by_mixdev = false; mousedev_close_device(mousedev); } } @@ -935,7 +935,7 @@ static int mixdev_add_device(struct mousedev *mousedev) if (retval) goto out; - mousedev->mixdev_open = 1; + mousedev->opened_by_mixdev = true; } get_device(&mousedev->dev); @@ -950,8 +950,8 @@ static void mixdev_remove_device(struct mousedev *mousedev) { mutex_lock(&mousedev_mix->mutex); - if (mousedev->mixdev_open) { - mousedev->mixdev_open = 0; + if (mousedev->opened_by_mixdev) { + mousedev->opened_by_mixdev = false; mousedev_close_device(mousedev); }