diff options
| author | Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> | 2013-01-30 22:26:12 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-31 15:11:08 -0500 |
| commit | cfc57557f204c09c2c028be6e18923e9475c311d (patch) | |
| tree | 6af0ee5112bdc11da2ae168216d9e18e53c1293d | |
| parent | 35de87deeec89410d60118939aa37e2499bb1659 (diff) | |
PNPACPI: Fix acpi_bus_get_device() check in drivers/pnp/pnpacpi/core.c
acpi_bus_get_device() returns int not acpi_status.
The patch change not to apply ACPI_FAILURE() to the return value of
acpi_bus_get_device().
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/pnp/pnpacpi/core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index 72e822e17d47..8813fc03aa09 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c | |||
| @@ -90,7 +90,7 @@ static int pnpacpi_set_resources(struct pnp_dev *dev) | |||
| 90 | pnp_dbg(&dev->dev, "set resources\n"); | 90 | pnp_dbg(&dev->dev, "set resources\n"); |
| 91 | 91 | ||
| 92 | handle = DEVICE_ACPI_HANDLE(&dev->dev); | 92 | handle = DEVICE_ACPI_HANDLE(&dev->dev); |
| 93 | if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) { | 93 | if (!handle || acpi_bus_get_device(handle, &acpi_dev)) { |
| 94 | dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__); | 94 | dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__); |
| 95 | return -ENODEV; | 95 | return -ENODEV; |
| 96 | } | 96 | } |
| @@ -123,7 +123,7 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev) | |||
| 123 | dev_dbg(&dev->dev, "disable resources\n"); | 123 | dev_dbg(&dev->dev, "disable resources\n"); |
| 124 | 124 | ||
| 125 | handle = DEVICE_ACPI_HANDLE(&dev->dev); | 125 | handle = DEVICE_ACPI_HANDLE(&dev->dev); |
| 126 | if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) { | 126 | if (!handle || acpi_bus_get_device(handle, &acpi_dev)) { |
| 127 | dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__); | 127 | dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__); |
| 128 | return 0; | 128 | return 0; |
| 129 | } | 129 | } |
| @@ -145,7 +145,7 @@ static bool pnpacpi_can_wakeup(struct pnp_dev *dev) | |||
| 145 | acpi_handle handle; | 145 | acpi_handle handle; |
| 146 | 146 | ||
| 147 | handle = DEVICE_ACPI_HANDLE(&dev->dev); | 147 | handle = DEVICE_ACPI_HANDLE(&dev->dev); |
| 148 | if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) { | 148 | if (!handle || acpi_bus_get_device(handle, &acpi_dev)) { |
| 149 | dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__); | 149 | dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__); |
| 150 | return false; | 150 | return false; |
| 151 | } | 151 | } |
| @@ -160,7 +160,7 @@ static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state) | |||
| 160 | int error = 0; | 160 | int error = 0; |
| 161 | 161 | ||
| 162 | handle = DEVICE_ACPI_HANDLE(&dev->dev); | 162 | handle = DEVICE_ACPI_HANDLE(&dev->dev); |
| 163 | if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) { | 163 | if (!handle || acpi_bus_get_device(handle, &acpi_dev)) { |
| 164 | dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__); | 164 | dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__); |
| 165 | return 0; | 165 | return 0; |
| 166 | } | 166 | } |
| @@ -197,7 +197,7 @@ static int pnpacpi_resume(struct pnp_dev *dev) | |||
| 197 | acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev); | 197 | acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev); |
| 198 | int error = 0; | 198 | int error = 0; |
| 199 | 199 | ||
| 200 | if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) { | 200 | if (!handle || acpi_bus_get_device(handle, &acpi_dev)) { |
| 201 | dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__); | 201 | dev_dbg(&dev->dev, "ACPI device not found in %s!\n", __func__); |
| 202 | return -ENODEV; | 202 | return -ENODEV; |
| 203 | } | 203 | } |
