diff for duplicates of <56E87C82.7080105@synaptics.com> diff --git a/a/1.txt b/N1/1.txt index ede3387..b11017c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,13 +13,18 @@ Acked-by: Andrew Duggan <aduggan@synaptics.com> > @@ -775,7 +775,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev, > sensor_query->has_abs = !!(query_buf[0] & RMI_F11_HAS_ABS); > sensor_query->has_gestures = !!(query_buf[0] & RMI_F11_HAS_GESTURES); -> sensor_query->has_sensitivity_adjust > - !!(query_buf[0] && RMI_F11_HAS_SENSITIVITY_ADJ); +> sensor_query->has_sensitivity_adjust = +> - !!(query_buf[0] && RMI_F11_HAS_SENSITIVITY_ADJ); > + !!(query_buf[0] & RMI_F11_HAS_SENSITIVITY_ADJ); > sensor_query->configurable = !!(query_buf[0] & RMI_F11_CONFIGURABLE); > -> sensor_query->nr_x_electrodes > @@ -803,7 +803,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev, -> sensor_query->has_bending_correction > !!(query_buf[0] & RMI_F11_HAS_BENDING_CORRECTION); -> sensor_query->has_large_object_suppression > - !!(query_buf[0] && RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION); +> sensor_query->nr_x_electrodes = +> @@ -803,7 +803,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev, +> sensor_query->has_bending_correction = +> !!(query_buf[0] & RMI_F11_HAS_BENDING_CORRECTION); +> sensor_query->has_large_object_suppression = +> - !!(query_buf[0] && RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION); > + !!(query_buf[0] & RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION); -> sensor_query->has_jitter_filter > !!(query_buf[0] & RMI_F11_HAS_JITTER_FILTER); +> sensor_query->has_jitter_filter = +> !!(query_buf[0] & RMI_F11_HAS_JITTER_FILTER); > query_size++; diff --git a/a/content_digest b/N1/content_digest index c77ed0c..7ea021b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020160315071140.GF13560@mwanda\0" "From\0Andrew Duggan <aduggan@synaptics.com>\0" "Subject\0Re: [patch] Input: synaptics-rmi4 - using logical instead of bitwise AND\0" - "Date\0Tue, 15 Mar 2016 21:20:02 +0000\0" + "Date\0Tue, 15 Mar 2016 14:20:02 -0700\0" "To\0Dan Carpenter <dan.carpenter@oracle.com>" " Dmitry Torokhov <dmitry.torokhov@gmail.com>\0" "Cc\0Henrik Rydberg <rydberg@bitmath.org>" @@ -26,15 +26,20 @@ "> @@ -775,7 +775,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev,\n" "> \tsensor_query->has_abs = !!(query_buf[0] & RMI_F11_HAS_ABS);\n" "> \tsensor_query->has_gestures = !!(query_buf[0] & RMI_F11_HAS_GESTURES);\n" - "> \tsensor_query->has_sensitivity_adjust > -\t\t!!(query_buf[0] && RMI_F11_HAS_SENSITIVITY_ADJ);\n" + "> \tsensor_query->has_sensitivity_adjust =\n" + "> -\t\t!!(query_buf[0] && RMI_F11_HAS_SENSITIVITY_ADJ);\n" "> +\t\t!!(query_buf[0] & RMI_F11_HAS_SENSITIVITY_ADJ);\n" "> \tsensor_query->configurable = !!(query_buf[0] & RMI_F11_CONFIGURABLE);\n" "> \n" - "> \tsensor_query->nr_x_electrodes > @@ -803,7 +803,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev,\n" - "> \t\tsensor_query->has_bending_correction > \t\t\t!!(query_buf[0] & RMI_F11_HAS_BENDING_CORRECTION);\n" - "> \t\tsensor_query->has_large_object_suppression > -\t\t!!(query_buf[0] && RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION);\n" + "> \tsensor_query->nr_x_electrodes =\n" + "> @@ -803,7 +803,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev,\n" + "> \t\tsensor_query->has_bending_correction =\n" + "> \t\t\t!!(query_buf[0] & RMI_F11_HAS_BENDING_CORRECTION);\n" + "> \t\tsensor_query->has_large_object_suppression =\n" + "> -\t\t!!(query_buf[0] && RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION);\n" "> +\t\t\t!!(query_buf[0] & RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION);\n" - "> \t\tsensor_query->has_jitter_filter > \t\t\t!!(query_buf[0] & RMI_F11_HAS_JITTER_FILTER);\n" + "> \t\tsensor_query->has_jitter_filter =\n" + "> \t\t\t!!(query_buf[0] & RMI_F11_HAS_JITTER_FILTER);\n" "> \t\tquery_size++;" -f5e50497ff1a0673ecb1a9467c8ffcd81910c67d199c149697f54a38e6c27436 +2cc2bc85264b36fba4c3b562f1ca24779f317d1cc7418db18d9fe6d506904499
diff --git a/a/1.txt b/N2/1.txt index ede3387..b11017c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -13,13 +13,18 @@ Acked-by: Andrew Duggan <aduggan@synaptics.com> > @@ -775,7 +775,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev, > sensor_query->has_abs = !!(query_buf[0] & RMI_F11_HAS_ABS); > sensor_query->has_gestures = !!(query_buf[0] & RMI_F11_HAS_GESTURES); -> sensor_query->has_sensitivity_adjust > - !!(query_buf[0] && RMI_F11_HAS_SENSITIVITY_ADJ); +> sensor_query->has_sensitivity_adjust = +> - !!(query_buf[0] && RMI_F11_HAS_SENSITIVITY_ADJ); > + !!(query_buf[0] & RMI_F11_HAS_SENSITIVITY_ADJ); > sensor_query->configurable = !!(query_buf[0] & RMI_F11_CONFIGURABLE); > -> sensor_query->nr_x_electrodes > @@ -803,7 +803,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev, -> sensor_query->has_bending_correction > !!(query_buf[0] & RMI_F11_HAS_BENDING_CORRECTION); -> sensor_query->has_large_object_suppression > - !!(query_buf[0] && RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION); +> sensor_query->nr_x_electrodes = +> @@ -803,7 +803,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev, +> sensor_query->has_bending_correction = +> !!(query_buf[0] & RMI_F11_HAS_BENDING_CORRECTION); +> sensor_query->has_large_object_suppression = +> - !!(query_buf[0] && RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION); > + !!(query_buf[0] & RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION); -> sensor_query->has_jitter_filter > !!(query_buf[0] & RMI_F11_HAS_JITTER_FILTER); +> sensor_query->has_jitter_filter = +> !!(query_buf[0] & RMI_F11_HAS_JITTER_FILTER); > query_size++; diff --git a/a/content_digest b/N2/content_digest index c77ed0c..636a2ec 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,14 +1,14 @@ "ref\020160315071140.GF13560@mwanda\0" "From\0Andrew Duggan <aduggan@synaptics.com>\0" "Subject\0Re: [patch] Input: synaptics-rmi4 - using logical instead of bitwise AND\0" - "Date\0Tue, 15 Mar 2016 21:20:02 +0000\0" + "Date\0Tue, 15 Mar 2016 14:20:02 -0700\0" "To\0Dan Carpenter <dan.carpenter@oracle.com>" " Dmitry Torokhov <dmitry.torokhov@gmail.com>\0" "Cc\0Henrik Rydberg <rydberg@bitmath.org>" Christopher Heiny <cheiny@synaptics.com> - linux-input@vger.kernel.org - linux-kernel@vger.kernel.org - " kernel-janitors@vger.kernel.org\0" + <linux-input@vger.kernel.org> + <linux-kernel@vger.kernel.org> + " <kernel-janitors@vger.kernel.org>\0" "\00:1\0" "b\0" "On 03/15/2016 12:11 AM, Dan Carpenter wrote:\n" @@ -26,15 +26,20 @@ "> @@ -775,7 +775,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev,\n" "> \tsensor_query->has_abs = !!(query_buf[0] & RMI_F11_HAS_ABS);\n" "> \tsensor_query->has_gestures = !!(query_buf[0] & RMI_F11_HAS_GESTURES);\n" - "> \tsensor_query->has_sensitivity_adjust > -\t\t!!(query_buf[0] && RMI_F11_HAS_SENSITIVITY_ADJ);\n" + "> \tsensor_query->has_sensitivity_adjust =\n" + "> -\t\t!!(query_buf[0] && RMI_F11_HAS_SENSITIVITY_ADJ);\n" "> +\t\t!!(query_buf[0] & RMI_F11_HAS_SENSITIVITY_ADJ);\n" "> \tsensor_query->configurable = !!(query_buf[0] & RMI_F11_CONFIGURABLE);\n" "> \n" - "> \tsensor_query->nr_x_electrodes > @@ -803,7 +803,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev,\n" - "> \t\tsensor_query->has_bending_correction > \t\t\t!!(query_buf[0] & RMI_F11_HAS_BENDING_CORRECTION);\n" - "> \t\tsensor_query->has_large_object_suppression > -\t\t!!(query_buf[0] && RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION);\n" + "> \tsensor_query->nr_x_electrodes =\n" + "> @@ -803,7 +803,7 @@ static int rmi_f11_get_query_parameters(struct rmi_device *rmi_dev,\n" + "> \t\tsensor_query->has_bending_correction =\n" + "> \t\t\t!!(query_buf[0] & RMI_F11_HAS_BENDING_CORRECTION);\n" + "> \t\tsensor_query->has_large_object_suppression =\n" + "> -\t\t!!(query_buf[0] && RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION);\n" "> +\t\t\t!!(query_buf[0] & RMI_F11_HAS_LARGE_OBJECT_SUPPRESSION);\n" - "> \t\tsensor_query->has_jitter_filter > \t\t\t!!(query_buf[0] & RMI_F11_HAS_JITTER_FILTER);\n" + "> \t\tsensor_query->has_jitter_filter =\n" + "> \t\t\t!!(query_buf[0] & RMI_F11_HAS_JITTER_FILTER);\n" "> \t\tquery_size++;" -f5e50497ff1a0673ecb1a9467c8ffcd81910c67d199c149697f54a38e6c27436 +baff2aa3bc5492d0ebe4db6dcf39e25e1afd3861163432ff0204a78d9efa1c84
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.