patch "iio: adc: meson-saradc: use NULL instead of 0 for pointer" added to staging-testing

DISCUSSION Martin Blumenstingl 3 participants 5 messages Jun 26, 2017 – Jun 28, 2017 1 message not in the archive

Subsystems (2)

Arm/Amlogic Meson SoC support IIO

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Martin Blumenstingl

author reviewer

2017-06-26 18:57 UTC #1 lore raw

Hi Greg, Hi Jonathan,

Quoted 9 lines · On Mon, Jun 26, 2017 at 7:09 AM, <[email protected]> wrote:

This is a note to let you know that I've just added the patch titled
iio: adc: meson-saradc: use NULL instead of 0 for pointer
to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-testing branch.

Quoted 7 lines

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will be merged to the staging-next branch sometime soon, after it passes testing, and the merge window is open.
If you have any questions about this process, please let me know.

is there a way to drop below patch from your repo?
during testing I found out that the code before and after this patch leads to a NULL deref. I provided a fix (see [0]) which solves the crash and the warning as reported by Paolo - and that fix is already part of v4.12-rc6
so the patch below will cause a merge conflict

Quoted 28 lines

From 6b503b216d1eff4d61a0bc34e09d1fd4d6e0ee79 Mon Sep 17 00:00:00 2001
From: Paolo Cretaro <[email protected]>
Date: Sun, 28 May 2017 13:24:38 +0200
Subject: iio: adc: meson-saradc: use NULL instead of 0 for pointer
Fix sparse warning: Using plain integer as NULL pointer
Signed-off-by Paolo Cretaro <[email protected]>
Acked-by Martin Blumenstingl <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>
---
 drivers/iio/adc/meson_saradc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/meson_saradc.c +1 -2
index 81cd39a57fe3..fb3f67a9ae1f 100644
@@ -481,7 +481,7 @@ static void meson_sar_adc_clear_fifo(struct iio_dev *indio_dev)
                if (!meson_sar_adc_get_fifo_count(indio_dev))
                        break;
 
-               regmap_read(priv->regmap, MESON_SAR_ADC_FIFO_RD, 0);
+               regmap_read(priv->regmap, MESON_SAR_ADC_FIFO_RD, NULL);
        }
 }
 
--

Quoted 3 lines

2.13.1

Regards,
Martin

[0] http://lists.infradead.org/pipermail/linux-amlogic/2017-June/003863.html

Jonathan Cameron

2017-06-26 19:30 UTC #2 lore raw

Quoted 18 lines · Martin Blumenstingl

Hi Greg, Hi Jonathan,
Quoted 15 lines · On Mon, Jun 26, 2017 at 7:09 AM, <[email protected]> wrote:
This is a note to let you know that I've just added the patch titled
iio: adc: meson-saradc: use NULL instead of 0 for pointer
to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-testing branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will be merged to the staging-next branch sometime soon, after it passes testing, and the merge window is open.

Quoted 7 lines

Quoted 1 line
If you have any questions about this process, please let me know.
is there a way to drop below patch from your repo?
during testing I found out that the code before and after this patch leads to a NULL deref. I provided a fix (see [0]) which solves the crash and the warning as reported by Paolo - and that fix is already part of v4.12-rc6
so the patch below will cause a merge conflict

Sorry my mess up. Will probably fall out in the wash or Greg could revert. Will have to check
the merge resolution in Linux next and when Linus pulls if it isn't reverted. Should be fine either way.

Jonathan

Quoted 42 lines

Quoted 2 lines
From 6b503b216d1eff4d61a0bc34e09d1fd4d6e0ee79 Mon Sep 17 00:00:00
2001
Quoted 6 lines
From: Paolo Cretaro <[email protected]>
Date: Sun, 28 May 2017 13:24:38 +0200
Subject: iio: adc: meson-saradc: use NULL instead of 0 for pointer
Fix sparse warning: Using plain integer as NULL pointer
Review
Quoted 8 lines
Signed-off-by Paolo Cretaro <[email protected]>
Acked-by Martin Blumenstingl <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>
---
 drivers/iio/adc/meson_saradc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0
b/drivers/iio/adc/meson_saradc.c
drivers/iio/adc/meson_saradc.c static void meson_sar_adc_clear_fifo(struct
Quoted 4 lines
index 81cd39a57fe3..fb3f67a9ae1f 100644
drivers/iio/adc/meson_saradc.c +0 -0
@@ -481,7 +481,7 @@ static void meson_sar_adc_clear_fifo(struct
iio_dev *indio_dev)
drivers/iio/adc/meson_saradc.c static void meson_sar_adc_clear_fifo(struct · line 484
Quoted 5 lines
drivers/iio/adc/meson_saradc.c +1 -1
                if (!meson_sar_adc_get_fifo_count(indio_dev))
                        break;
 
-               regmap_read(priv->regmap, MESON_SAR_ADC_FIFO_RD, 0);
+               regmap_read(priv->regmap, MESON_SAR_ADC_FIFO_RD,
NULL);
Quoted 7 lines
drivers/iio/adc/meson_saradc.c +0 -1
        }
 }
 
--
2.13.1
Regards,
Martin
[0]
http://lists.infradead.org/pipermail/linux-amlogic/2017-June/003863.html

Signature · 1 line

Sent from my Android device with K-9 Mail. Please excuse my brevity.

Martin Blumenstingl

author reviewer

2017-06-26 21:03 UTC #3 lore raw

Quoted 29 lines · Jonathan Cameron

Quoted 18 lines · Martin Blumenstingl
Hi Greg, Hi Jonathan,
Quoted 15 lines · On Mon, Jun 26, 2017 at 7:09 AM, <[email protected]> wrote:
This is a note to let you know that I've just added the patch titled
iio: adc: meson-saradc: use NULL instead of 0 for pointer
to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-testing branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will be merged to the staging-next branch sometime soon, after it passes testing, and the merge window is open.
Quoted 7 lines
Quoted 1 line
If you have any questions about this process, please let me know.
is there a way to drop below patch from your repo?
during testing I found out that the code before and after this patch leads to a NULL deref. I provided a fix (see [0]) which solves the crash and the warning as reported by Paolo - and that fix is already part of v4.12-rc6
so the patch below will cause a merge conflict

Quoted 3 lines

Sorry my mess up. Will probably fall out in the wash or Greg could revert. Will have to check
the merge resolution in Linux next and when Linus pulls if it isn't reverted. Should be fine either way.

OK, I will re-check this once the everything has landed in Linus' tree actually it's me who made the mess (by implementing broken stuff in the first place) - but it will all be fine!

Quoted 46 lines

Jonathan
Quoted 37 lines
Quoted 2 lines
From 6b503b216d1eff4d61a0bc34e09d1fd4d6e0ee79 Mon Sep 17 00:00:00
2001
Quoted 6 lines
From: Paolo Cretaro <[email protected]>
Date: Sun, 28 May 2017 13:24:38 +0200
Subject: iio: adc: meson-saradc: use NULL instead of 0 for pointer
Fix sparse warning: Using plain integer as NULL pointer
Review
Quoted 8 lines
Signed-off-by Paolo Cretaro <[email protected]>
Acked-by Martin Blumenstingl <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>
---
 drivers/iio/adc/meson_saradc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0
b/drivers/iio/adc/meson_saradc.c
drivers/iio/adc/meson_saradc.c static void meson_sar_adc_clear_fifo(struct
Quoted 4 lines
index 81cd39a57fe3..fb3f67a9ae1f 100644
drivers/iio/adc/meson_saradc.c +0 -0
@@ -481,7 +481,7 @@ static void meson_sar_adc_clear_fifo(struct
iio_dev *indio_dev)
drivers/iio/adc/meson_saradc.c static void meson_sar_adc_clear_fifo(struct · line 484
Quoted 5 lines
drivers/iio/adc/meson_saradc.c +1 -1
                if (!meson_sar_adc_get_fifo_count(indio_dev))
                        break;
 
-               regmap_read(priv->regmap, MESON_SAR_ADC_FIFO_RD, 0);
+               regmap_read(priv->regmap, MESON_SAR_ADC_FIFO_RD,
NULL);
Quoted 7 lines
drivers/iio/adc/meson_saradc.c +0 -1
        }
 }
 
--
2.13.1
Quoted 5 lines
Regards,
Martin
[0]
http://lists.infradead.org/pipermail/linux-amlogic/2017-June/003863.html
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.

Greg KH

2017-06-27 06:43 UTC #4 lore raw

In reply to Martin Blumenstingl

Quoted 18 lines · Martin Blumenstingl

Hi Greg, Hi Jonathan,
Quoted 15 lines · On Mon, Jun 26, 2017 at 7:09 AM, <[email protected]> wrote:
This is a note to let you know that I've just added the patch titled
iio: adc: meson-saradc: use NULL instead of 0 for pointer
to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-testing branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will be merged to the staging-next branch sometime soon, after it passes testing, and the merge window is open.

Quoted 7 lines

Quoted 1 line
If you have any questions about this process, please let me know.
is there a way to drop below patch from your repo?
during testing I found out that the code before and after this patch leads to a NULL deref. I provided a fix (see [0]) which solves the crash and the warning as reported by Paolo - and that fix is already part of v4.12-rc6
so the patch below will cause a merge conflict

I already handled the merge conflict, can you verify I got it right in my tree?

thanks,

greg k-h

Martin Blumenstingl

author reviewer

2017-06-28 20:12 UTC #5 lore raw

Hi Greg,

Quoted 27 lines · Greg KH

Quoted 18 lines · Martin Blumenstingl
Hi Greg, Hi Jonathan,
Quoted 15 lines · On Mon, Jun 26, 2017 at 7:09 AM, <[email protected]> wrote:
This is a note to let you know that I've just added the patch titled
iio: adc: meson-saradc: use NULL instead of 0 for pointer
to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-testing branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will be merged to the staging-next branch sometime soon, after it passes testing, and the merge window is open.
Quoted 7 lines
Quoted 1 line
If you have any questions about this process, please let me know.
is there a way to drop below patch from your repo?
during testing I found out that the code before and after this patch leads to a NULL deref. I provided a fix (see [0]) which solves the crash and the warning as reported by Paolo - and that fix is already part of v4.12-rc6
so the patch below will cause a merge conflict

Quoted 2 lines

I already handled the merge conflict, can you verify I got it right in my tree?

I just checked your staging.git/staging-testing branch: it seems that the conflict was resolved correctly (meaning that Paolo's patch is non-existent in your tree, which is correct)

Regards,
Martin