diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 21:37:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 21:37:55 +0200 |
| commit | b31a76546c08f618e355bd12a7cc138c045374b7 (patch) | |
| tree | bc1aba4774e8f4910253c1eb409de278178dfed5 /drivers/acpi/scan.c | |
| parent | 4a77a932b9958ffd393581cd5350ca0ef39711de (diff) | |
| parent | 45853507c9362b0bd606b37e8c7c7e7551caa78b (diff) | |
| download | linux-stable-b31a76546c08f618e355bd12a7cc138c045374b7.tar.gz linux-stable-b31a76546c08f618e355bd12a7cc138c045374b7.tar.bz2 linux-stable-b31a76546c08f618e355bd12a7cc138c045374b7.zip | |
Merge tag 'omap-for-v3.11/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
From Tony Lindgren:
Minor board changes for v3.11 merge window. These are
tapering down finally as we're getting closer to making
omap2+ DT only.
* tag 'omap-for-v3.11/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2plus_defconfig: enable USB_PHY and NOP_USB_XCEIV
ARM: OMAP1: nokia770: enable Tahvo
ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN
arm: omap: board-overo: reset GPIO for SMSC911x
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 44225cb15f3a..b14ac46948c9 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1017,11 +1017,8 @@ acpi_bus_driver_init(struct acpi_device *device, struct acpi_driver *driver) return -ENOSYS; result = driver->ops.add(device); - if (result) { - device->driver = NULL; - device->driver_data = NULL; + if (result) return result; - } device->driver = driver; |