diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 04:13:01 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 04:13:01 -0400 |
commit | e644dae645e167d154c0526358940986682a72b0 (patch) | |
tree | 972993c6568085b8d407fc7e13de10f4b93c651d /lib/dma-debug.c | |
parent | 899c612d74d4a242158a4db20367388d6299c028 (diff) | |
parent | 86809173ce32ef03bd4d0389dfc72df0c805e9c4 (diff) |
Merge branch 'next' into for-linus
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) | |||
170 | return false; | 170 | return false; |
171 | 171 | ||
172 | /* driver filter on but not yet initialized */ | 172 | /* driver filter on but not yet initialized */ |
173 | drv = get_driver(dev->driver); | 173 | drv = dev->driver; |
174 | if (!drv) | 174 | if (!drv) |
175 | return false; | 175 | return false; |
176 | 176 | ||
@@ -185,7 +185,6 @@ static bool driver_filter(struct device *dev) | |||
185 | } | 185 | } |
186 | 186 | ||
187 | read_unlock_irqrestore(&driver_name_lock, flags); | 187 | read_unlock_irqrestore(&driver_name_lock, flags); |
188 | put_driver(drv); | ||
189 | 188 | ||
190 | return ret; | 189 | return ret; |
191 | } | 190 | } |