projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linville-e1000' of git://git.tuxdriver.com/git/netdev-jwl
[powerpc.git]
/
drivers
/
ide
/
ide.c
diff --git
a/drivers/ide/ide.c
b/drivers/ide/ide.c
index
73ca8f7
..
8af179b
100644
(file)
--- a/
drivers/ide/ide.c
+++ b/
drivers/ide/ide.c
@@
-803,6
+803,7
@@
found:
hwif->irq = hw->irq;
hwif->noprobe = 0;
hwif->chipset = hw->chipset;
hwif->irq = hw->irq;
hwif->noprobe = 0;
hwif->chipset = hw->chipset;
+ hwif->gendev.parent = hw->dev;
if (!initializing) {
probe_hwif_init_with_fixup(hwif, fixup);
if (!initializing) {
probe_hwif_init_with_fixup(hwif, fixup);
@@
-864,9
+865,8
@@
static int __ide_add_setting(ide_drive_t *drive, const char *name, int rw, int r
down(&ide_setting_sem);
while ((*p) && strcmp((*p)->name, name) < 0)
p = &((*p)->next);
down(&ide_setting_sem);
while ((*p) && strcmp((*p)->name, name) < 0)
p = &((*p)->next);
- if ((setting = k
m
alloc(sizeof(*setting), GFP_KERNEL)) == NULL)
+ if ((setting = k
z
alloc(sizeof(*setting), GFP_KERNEL)) == NULL)
goto abort;
goto abort;
- memset(setting, 0, sizeof(*setting));
if ((setting->name = kmalloc(strlen(name) + 1, GFP_KERNEL)) == NULL)
goto abort;
strcpy(setting->name, name);
if ((setting->name = kmalloc(strlen(name) + 1, GFP_KERNEL)) == NULL)
goto abort;
strcpy(setting->name, name);
@@
-889,8
+889,7
@@
static int __ide_add_setting(ide_drive_t *drive, const char *name, int rw, int r
return 0;
abort:
up(&ide_setting_sem);
return 0;
abort:
up(&ide_setting_sem);
- if (setting)
- kfree(setting);
+ kfree(setting);
return -1;
}
return -1;
}