| Message ID | 1311760070-21532-5-git-send-email-sven@narfation.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Sven, Thanks for the patch. On Wednesday 27 July 2011 11:47:44 Sven Eckelmann wrote: > atomic_dec_not_zero is defined for each architecture through > <linux/atomic.h> to provide the functionality of > atomic_add_unless(x, -1, 0). > > Signed-off-by: Sven Eckelmann <sven@narfation.org> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> I'll queue this to my tree for v3.2. Please let me know if you would rather push the patch through another tree. > Cc: linux-media@vger.kernel.org > --- > drivers/media/video/omap3isp/ispstat.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/media/video/omap3isp/ispstat.c > b/drivers/media/video/omap3isp/ispstat.c index b44cb68..81b1ec9 100644 > --- a/drivers/media/video/omap3isp/ispstat.c > +++ b/drivers/media/video/omap3isp/ispstat.c > @@ -652,7 +652,7 @@ static int isp_stat_buf_process(struct ispstat *stat, > int buf_state) { > int ret = STAT_NO_BUF; > > - if (!atomic_add_unless(&stat->buf_err, -1, 0) && > + if (!atomic_dec_not_zero(&stat->buf_err) && > buf_state == STAT_BUF_DONE && stat->state == ISPSTAT_ENABLED) { > ret = isp_stat_buf_queue(stat); > isp_stat_buf_next(stat);
On Sunday 31 July 2011 17:00:43 Laurent Pinchart wrote: > Hi Sven, > > Thanks for the patch. > > On Wednesday 27 July 2011 11:47:44 Sven Eckelmann wrote: > > atomic_dec_not_zero is defined for each architecture through > > <linux/atomic.h> to provide the functionality of > > atomic_add_unless(x, -1, 0). > > > > Signed-off-by: Sven Eckelmann <sven@narfation.org> > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > I'll queue this to my tree for v3.2. Please let me know if you would rather > push the patch through another tree. The problem is that until now no one from linux-arch has applied the patch 01/11 in his tree (which is needed before this patch can be applied) and you tree have to be based on the "yet to be chosen linux-arch tree". Otherwise your tree will just break and not be acceptable for a pull request. Maybe it is easier when one person applies 01-11 after 02-11 was Acked-by the responsible maintainers. 02 is more or less automatically Acked-by us :) 04, 09 and 10 are also Acked. ... and the rest is waiting for actions. Kind regards, Sven
Hi Sven, On Monday 01 August 2011 12:07:15 Sven Eckelmann wrote: > On Sunday 31 July 2011 17:00:43 Laurent Pinchart wrote: > > On Wednesday 27 July 2011 11:47:44 Sven Eckelmann wrote: > > > atomic_dec_not_zero is defined for each architecture through > > > <linux/atomic.h> to provide the functionality of > > > atomic_add_unless(x, -1, 0). > > > > > > Signed-off-by: Sven Eckelmann <sven@narfation.org> > > > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > > I'll queue this to my tree for v3.2. Please let me know if you would > > rather push the patch through another tree. > > The problem is that until now no one from linux-arch has applied the patch > 01/11 in his tree (which is needed before this patch can be applied) and > you tree have to be based on the "yet to be chosen linux-arch tree". > Otherwise your tree will just break and not be acceptable for a pull > request. > > Maybe it is easier when one person applies 01-11 after 02-11 was Acked-by > the responsible maintainers. > > 02 is more or less automatically Acked-by us :) > 04, 09 and 10 are also Acked. > ... and the rest is waiting for actions. OK. I'm fine with 05/11 being pushed through any tree with my ack. Please let me know if/when you want me to apply it to my tree.
diff --git a/drivers/media/video/omap3isp/ispstat.c b/drivers/media/video/omap3isp/ispstat.c index b44cb68..81b1ec9 100644 --- a/drivers/media/video/omap3isp/ispstat.c +++ b/drivers/media/video/omap3isp/ispstat.c @@ -652,7 +652,7 @@ static int isp_stat_buf_process(struct ispstat *stat, int buf_state) { int ret = STAT_NO_BUF; - if (!atomic_add_unless(&stat->buf_err, -1, 0) && + if (!atomic_dec_not_zero(&stat->buf_err) && buf_state == STAT_BUF_DONE && stat->state == ISPSTAT_ENABLED) { ret = isp_stat_buf_queue(stat); isp_stat_buf_next(stat);
atomic_dec_not_zero is defined for each architecture through <linux/atomic.h> to provide the functionality of atomic_add_unless(x, -1, 0). Signed-off-by: Sven Eckelmann <sven@narfation.org> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: linux-media@vger.kernel.org --- drivers/media/video/omap3isp/ispstat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)