diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 23:15:48 +0400 | 
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 23:15:48 +0400 | 
| commit | ab2f75ce55ef6f903348026271e30796f016851f (patch) | |
| tree | 8e019d460e92ee6ac2b2ea54aa0b93770bf933ef /lib/dma-debug.c | |
| parent | f56b71f5d5a3944acdcb0e5e1739574d95ddf61a (diff) | |
| parent | da5a70f3519fd6f73ece3eea261a861c9a4d6bbd (diff) | |
| download | linux-ab2f75ce55ef6f903348026271e30796f016851f.tar.xz | |
Merge branch 'depends/driver-core' into ux500/dt
Conflicts:
	drivers/base/cpu.c
Diffstat (limited to 'lib/dma-debug.c')
| -rw-r--r-- | lib/dma-debug.c | 3 | 
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index fea790a2b176..13ef2338be41 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -170,7 +170,7 @@ static bool driver_filter(struct device *dev)  		return false;  	/* driver filter on but not yet initialized */ -	drv = get_driver(dev->driver); +	drv = dev->driver;  	if (!drv)  		return false; @@ -185,7 +185,6 @@ static bool driver_filter(struct device *dev)  	}  	read_unlock_irqrestore(&driver_name_lock, flags); -	put_driver(drv);  	return ret;  }  | 
