diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2012-02-13 06:30:04 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 06:30:04 +0000 |
| commit | eaa5699e3bff8e8335757cf401451ffbd4a88109 (patch) | |
| tree | a5a23148d26f9d083080d94991e8ceed12c0857b /lib/dma-debug.c | |
| parent | Linux 3.3-rc3 (diff) | |
| parent | Documentation: add information for new sysfs soc bus functionality (diff) | |
| download | linux-rng-eaa5699e3bff8e8335757cf401451ffbd4a88109.tar.xz linux-rng-eaa5699e3bff8e8335757cf401451ffbd4a88109.zip | |
Merge branch 'depends/driver-core' into next/soc2
* depends/driver-core: (55 commits)
Documentation: add information for new sysfs soc bus functionality
drivers/base: add bus for System-on-Chip devices
DWC3: use module_pci_driver
PCI: Add helper macro for pci_register_driver boilerplate
w1: Use linux/gpio.h rather than asm/gpio.h
drivers: hv: Increase the number of VCPUs supported in the guest
drivers: hv: kvp: Cleanup the kernel/user protocol
tools: hv: Use hyperv.h to get the KVP definitions
drivers: hv: Cleanup the kvp related state in hyperv.h
ACPI: remove duplicated lines of merging problems with acpi_processor_start
cpufreq/gx: Fix the compile error
drivers: hv: kvp: Move the contents of hv_kvp.h to hyperv.h
drivers: hv: kvp: Add/cleanup connector defines
sysfs: Update the name hash when renaming sysfs entries
PCI/XEN: Fix bug introduced by a recent change
USB/PCI/PCMCIA: Clean up new_id and remove_id sysfs attribute routines
CPU: Introduce ARCH_HAS_CPU_AUTOPROBE and X86 parts
x86: autoload microcode driver on Intel and AMD systems v2
cpufreq: Add support for x86 cpuinfo auto loading v4
X86: Introduce HW-Pstate scattered cpuid feature
...
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; } |