Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 10687
b: refs/heads/master
c: 5457b6a
h: refs/heads/master
i:
  10685: efefecf
  10683: 121956b
  10679: a6adeaf
  10671: 7bac694
  10655: ad2dcd7
  10623: 1598fbf
v: v3
  • Loading branch information
Russell King authored and Greg Kroah-Hartman committed Oct 28, 2005
1 parent d702429 commit bd9089e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 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: a1720fdbd0f90e64668a59a304d01c5ba001b450
refs/heads/master: 5457b6a6013516a73b8f48ec1adb9984b577a5c1
10 changes: 4 additions & 6 deletions trunk/drivers/scsi/megaraid/megaraid_mbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ static void megaraid_exit(void);

static int megaraid_probe_one(struct pci_dev*, const struct pci_device_id *);
static void megaraid_detach_one(struct pci_dev *);
static void megaraid_mbox_shutdown(struct device *);
static void megaraid_mbox_shutdown(struct pci_dev *);

static int megaraid_io_attach(adapter_t *);
static void megaraid_io_detach(adapter_t *);
Expand Down Expand Up @@ -369,9 +369,7 @@ static struct pci_driver megaraid_pci_driver_g = {
.id_table = pci_id_table_g,
.probe = megaraid_probe_one,
.remove = __devexit_p(megaraid_detach_one),
.driver = {
.shutdown = megaraid_mbox_shutdown,
}
.shutdown = megaraid_mbox_shutdown,
};


Expand Down Expand Up @@ -673,9 +671,9 @@ megaraid_detach_one(struct pci_dev *pdev)
* Shutdown notification, perform flush cache
*/
static void
megaraid_mbox_shutdown(struct device *device)
megaraid_mbox_shutdown(struct pci_dev *pdev)
{
adapter_t *adapter = pci_get_drvdata(to_pci_dev(device));
adapter_t *adapter = pci_get_drvdata(pdev);
static int counter;

if (!adapter) {
Expand Down

0 comments on commit bd9089e

Please sign in to comment.