| Message ID | 1352913757-8406-1-git-send-email-andy.gross@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Nov 14, 2012 at 11:22 AM, Andy Gross <andy.gross@ti.com> wrote: > Return -ENOMEM if dmm_txn_init cannot allocate a refill engine. > > v2: Fix typing issue seen with newer compilers > > Signed-off-by: Andy Gross <andy.gross@ti.com> Signed-off-by: Rob Clark <rob@ti.com > --- > drivers/staging/omapdrm/omap_dmm_tiler.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c > index 3ae3955..1499521 100644 > --- a/drivers/staging/omapdrm/omap_dmm_tiler.c > +++ b/drivers/staging/omapdrm/omap_dmm_tiler.c > @@ -279,7 +279,7 @@ static int fill(struct tcm_area *area, struct page **pages, > > txn = dmm_txn_init(omap_dmm, area->tcm); > if (IS_ERR_OR_NULL(txn)) > - return PTR_ERR(txn); > + return -ENOMEM; > > tcm_for_each_slice(slice, *area, area_s) { > struct pat_area p_area = { > -- > 1.7.5.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
On Wed, Nov 14, 2012 at 11:22:37AM -0600, Andy Gross wrote: > Return -ENOMEM if dmm_txn_init cannot allocate a refill engine. > > v2: Fix typing issue seen with newer compilers > > Signed-off-by: Andy Gross <andy.gross@ti.com> > Signed-off-by: Rob Clark <rob@ti.com> > --- > drivers/staging/omapdrm/omap_dmm_tiler.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) This doesn't apply anymore, care to refresh it against my latest tree? thanks, greg k-h
diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c index 3ae3955..1499521 100644 --- a/drivers/staging/omapdrm/omap_dmm_tiler.c +++ b/drivers/staging/omapdrm/omap_dmm_tiler.c @@ -279,7 +279,7 @@ static int fill(struct tcm_area *area, struct page **pages, txn = dmm_txn_init(omap_dmm, area->tcm); if (IS_ERR_OR_NULL(txn)) - return PTR_ERR(txn); + return -ENOMEM; tcm_for_each_slice(slice, *area, area_s) { struct pat_area p_area = {
Return -ENOMEM if dmm_txn_init cannot allocate a refill engine. v2: Fix typing issue seen with newer compilers Signed-off-by: Andy Gross <andy.gross@ti.com> --- drivers/staging/omapdrm/omap_dmm_tiler.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)