git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
ata
/
libata-acpi.c
diff --git
a/drivers/ata/libata-acpi.c
b/drivers/ata/libata-acpi.c
index 7b5eea7e01dc83e5a42f0c075472ca67ef7e38ee..8b5ea399a4f4fa7dfe04765292f31af4c8750fba 100644
(file)
--- a/
drivers/ata/libata-acpi.c
+++ b/
drivers/ata/libata-acpi.c
@@
-145,12
+145,6
@@
static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev,
struct ata_eh_info *ehi = &ap->link.eh_info;
int wait = 0;
unsigned long flags;
- acpi_handle handle;
-
- if (dev)
- handle = dev->acpi_handle;
- else
- handle = ap->acpi_handle;
spin_lock_irqsave(ap->lock, flags);
/*