projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] USB: ub 4: Zaitcev's quasi-S/G
[powerpc.git]
/
drivers
/
ide
/
ide-probe.c
diff --git
a/drivers/ide/ide-probe.c
b/drivers/ide/ide-probe.c
index
7df85af
..
c1128ae
100644
(file)
--- a/
drivers/ide/ide-probe.c
+++ b/
drivers/ide/ide-probe.c
@@
-978,8
+978,7
@@
static int ide_init_queue(ide_drive_t *drive)
* do not.
*/
* do not.
*/
- q = blk_init_queue_node(do_ide_request, &ide_lock,
- pcibus_to_node(drive->hwif->pci_dev->bus));
+ q = blk_init_queue_node(do_ide_request, &ide_lock, hwif_to_node(hwif));
if (!q)
return 1;
if (!q)
return 1;
@@
-1048,6
+1047,8
@@
static int init_irq (ide_hwif_t *hwif)
BUG_ON(in_interrupt());
BUG_ON(irqs_disabled());
BUG_ON(in_interrupt());
BUG_ON(irqs_disabled());
+ BUG_ON(hwif == NULL);
+
down(&ide_cfg_sem);
hwif->hwgroup = NULL;
#if MAX_HWIFS > 1
down(&ide_cfg_sem);
hwif->hwgroup = NULL;
#if MAX_HWIFS > 1
@@
-1097,7
+1098,7
@@
static int init_irq (ide_hwif_t *hwif)
spin_unlock_irq(&ide_lock);
} else {
hwgroup = kmalloc_node(sizeof(ide_hwgroup_t), GFP_KERNEL,
spin_unlock_irq(&ide_lock);
} else {
hwgroup = kmalloc_node(sizeof(ide_hwgroup_t), GFP_KERNEL,
-
pcibus_to_node(hwif->drives[0].hwif->pci_dev->bus
));
+
hwif_to_node(hwif->drives[0].hwif
));
if (!hwgroup)
goto out_up;
if (!hwgroup)
goto out_up;