projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v3.10/topic/misc' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
bus
/
mvebu-mbus.c
diff --git
a/drivers/bus/mvebu-mbus.c
b/drivers/bus/mvebu-mbus.c
index 8740f46b4d0d3a55c350540d096c8c7fc6318a49..5dcc8305abd15680e16c517bbdeab1c6ea4bd29c 100644
(file)
--- a/
drivers/bus/mvebu-mbus.c
+++ b/
drivers/bus/mvebu-mbus.c
@@
-250,12
+250,6
@@
static int mvebu_mbus_window_conflicts(struct mvebu_mbus_state *mbus,
*/
if ((u64)base < wend && end > wbase)
return 0;
-
- /*
- * Check if target/attribute conflicts
- */
- if (target == wtarget && attr == wattr)
- return 0;
}
return 1;