Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5525
b: refs/heads/master
c: 889371f
h: refs/heads/master
i:
  5523: 00a3334
v: v3
  • Loading branch information
Linus Torvalds committed Jul 30, 2005
1 parent 08c3823 commit f48909d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 035a4a4f8976bdf12aab992c630d3a6cfba90ea8
refs/heads/master: 889371f61fd5bb914d0331268f12432590cf7e85
9 changes: 0 additions & 9 deletions trunk/drivers/pcmcia/yenta_socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -1107,8 +1107,6 @@ static int yenta_dev_suspend (struct pci_dev *dev, pm_message_t state)
pci_read_config_dword(dev, 17*4, &socket->saved_state[1]);
pci_disable_device(dev);

free_irq(dev->irq, socket);

/*
* Some laptops (IBM T22) do not like us putting the Cardbus
* bridge into D3. At a guess, some other laptop will
Expand All @@ -1134,13 +1132,6 @@ static int yenta_dev_resume (struct pci_dev *dev)
pci_enable_device(dev);
pci_set_master(dev);

if (socket->cb_irq)
if (request_irq(socket->cb_irq, yenta_interrupt,
SA_SHIRQ, "yenta", socket)) {
printk(KERN_WARNING "Yenta: request_irq() failed on resume!\n");
socket->cb_irq = 0;
}

if (socket->type && socket->type->restore_state)
socket->type->restore_state(socket);
}
Expand Down

0 comments on commit f48909d

Please sign in to comment.