From 8f5ff3b971d1c939e8b70b55a03529bc6d5573c5 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 3 Jul 2011 23:53:13 +0100 Subject: [PATCH] --- yaml --- r: 258170 b: refs/heads/master c: e2f521e247576c897e1bf0ada801e87c7e2db89f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/common/dmabounce.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5818282f8b2d..4206b1045bde 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd3641fc3cf6d10b7cf4e266c2f651517779e727 +refs/heads/master: e2f521e247576c897e1bf0ada801e87c7e2db89f diff --git a/trunk/arch/arm/common/dmabounce.c b/trunk/arch/arm/common/dmabounce.c index 6ae292cc43bf..0077c1b7d7ff 100644 --- a/trunk/arch/arm/common/dmabounce.c +++ b/trunk/arch/arm/common/dmabounce.c @@ -210,10 +210,7 @@ static struct safe_buffer *find_safe_buffer_dev(struct device *dev, if (!dev || !dev->archdata.dmabounce) return NULL; if (dma_mapping_error(dev, dma_addr)) { - if (dev) - dev_err(dev, "Trying to %s invalid mapping\n", where); - else - pr_err("unknown device: Trying to %s invalid mapping\n", where); + dev_err(dev, "Trying to %s invalid mapping\n", where); return NULL; } return find_safe_buffer(dev->archdata.dmabounce, dma_addr);