diff options
Diffstat (limited to 'drivers/ide/ide-pnp.c')
-rw-r--r-- | drivers/ide/ide-pnp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c index 03f2ef5470a3..89cd5cbe8573 100644 --- a/drivers/ide/ide-pnp.c +++ b/drivers/ide/ide-pnp.c | |||
@@ -29,9 +29,9 @@ static struct pnp_device_id idepnp_devices[] = { | |||
29 | 29 | ||
30 | static int idepnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) | 30 | static int idepnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) |
31 | { | 31 | { |
32 | hw_regs_t hw; | ||
33 | ide_hwif_t *hwif; | 32 | ide_hwif_t *hwif; |
34 | unsigned long base, ctl; | 33 | unsigned long base, ctl; |
34 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; | ||
35 | 35 | ||
36 | printk(KERN_INFO DRV_NAME ": generic PnP IDE interface\n"); | 36 | printk(KERN_INFO DRV_NAME ": generic PnP IDE interface\n"); |
37 | 37 | ||
@@ -64,11 +64,9 @@ static int idepnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) | |||
64 | u8 index = hwif->index; | 64 | u8 index = hwif->index; |
65 | u8 idx[4] = { index, 0xff, 0xff, 0xff }; | 65 | u8 idx[4] = { index, 0xff, 0xff, 0xff }; |
66 | 66 | ||
67 | ide_init_port_hw(hwif, &hw); | ||
68 | |||
69 | pnp_set_drvdata(dev, hwif); | 67 | pnp_set_drvdata(dev, hwif); |
70 | 68 | ||
71 | ide_device_add(idx, NULL); | 69 | ide_device_add(idx, NULL, hws); |
72 | 70 | ||
73 | return 0; | 71 | return 0; |
74 | } | 72 | } |