diff options
Diffstat (limited to 'drivers/ide/pci/serverworks.c')
-rw-r--r-- | drivers/ide/pci/serverworks.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c index c3bdc6e51a48..3dff2aea317e 100644 --- a/drivers/ide/pci/serverworks.c +++ b/drivers/ide/pci/serverworks.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
34 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
35 | #include <linux/hdreg.h> | ||
36 | #include <linux/ide.h> | 35 | #include <linux/ide.h> |
37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
38 | 37 | ||
@@ -57,8 +56,10 @@ static struct pci_dev *isa_dev; | |||
57 | 56 | ||
58 | static int check_in_drive_lists (ide_drive_t *drive, const char **list) | 57 | static int check_in_drive_lists (ide_drive_t *drive, const char **list) |
59 | { | 58 | { |
59 | char *m = (char *)&drive->id[ATA_ID_PROD]; | ||
60 | |||
60 | while (*list) | 61 | while (*list) |
61 | if (!strcmp(*list++, drive->id->model)) | 62 | if (!strcmp(*list++, m)) |
62 | return 1; | 63 | return 1; |
63 | return 0; | 64 | return 0; |
64 | } | 65 | } |
@@ -174,7 +175,7 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
174 | pci_write_config_byte(dev, 0x54, ultra_enable); | 175 | pci_write_config_byte(dev, 0x54, ultra_enable); |
175 | } | 176 | } |
176 | 177 | ||
177 | static unsigned int __devinit init_chipset_svwks(struct pci_dev *dev) | 178 | static unsigned int init_chipset_svwks(struct pci_dev *dev) |
178 | { | 179 | { |
179 | unsigned int reg; | 180 | unsigned int reg; |
180 | u8 btr; | 181 | u8 btr; |
@@ -447,6 +448,8 @@ static struct pci_driver driver = { | |||
447 | .id_table = svwks_pci_tbl, | 448 | .id_table = svwks_pci_tbl, |
448 | .probe = svwks_init_one, | 449 | .probe = svwks_init_one, |
449 | .remove = ide_pci_remove, | 450 | .remove = ide_pci_remove, |
451 | .suspend = ide_pci_suspend, | ||
452 | .resume = ide_pci_resume, | ||
450 | }; | 453 | }; |
451 | 454 | ||
452 | static int __init svwks_ide_init(void) | 455 | static int __init svwks_ide_init(void) |