diff options
Diffstat (limited to 'drivers/ide/h8300/ide-h8300.c')
-rw-r--r-- | drivers/ide/h8300/ide-h8300.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c index 9fa78e98d1ba..4f6d0191cf6c 100644 --- a/drivers/ide/h8300/ide-h8300.c +++ b/drivers/ide/h8300/ide-h8300.c | |||
@@ -84,7 +84,7 @@ static inline void hwif_setup(ide_hwif_t *hwif) | |||
84 | hwif->INSL = NULL; | 84 | hwif->INSL = NULL; |
85 | } | 85 | } |
86 | 86 | ||
87 | void __init h8300_ide_init(void) | 87 | static int __init h8300_ide_init(void) |
88 | { | 88 | { |
89 | hw_regs_t hw; | 89 | hw_regs_t hw; |
90 | ide_hwif_t *hwif; | 90 | ide_hwif_t *hwif; |
@@ -104,7 +104,7 @@ void __init h8300_ide_init(void) | |||
104 | hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]); | 104 | hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]); |
105 | if (hwif == NULL) { | 105 | if (hwif == NULL) { |
106 | printk(KERN_ERR "ide-h8300: IDE I/F register failed\n"); | 106 | printk(KERN_ERR "ide-h8300: IDE I/F register failed\n"); |
107 | return; | 107 | return -ENOENT; |
108 | } | 108 | } |
109 | 109 | ||
110 | index = hwif->index; | 110 | index = hwif->index; |
@@ -117,8 +117,12 @@ void __init h8300_ide_init(void) | |||
117 | 117 | ||
118 | ide_device_add(idx); | 118 | ide_device_add(idx); |
119 | 119 | ||
120 | return; | 120 | return 0; |
121 | 121 | ||
122 | out_busy: | 122 | out_busy: |
123 | printk(KERN_ERR "ide-h8300: IDE I/F resource already used.\n"); | 123 | printk(KERN_ERR "ide-h8300: IDE I/F resource already used.\n"); |
124 | |||
125 | return -EBUSY; | ||
124 | } | 126 | } |
127 | |||
128 | module_init(h8300_ide_init); | ||