lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.26' into bkl-removal

Browse Source
This commit is contained in:
Jonathan Corbet
2008-07-14 15:29:34 -06:00
parent feae1ef116 bce7f793da
commit 2fceef397f
1975 changed files with 41893 additions and 19758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/macintosh/mediabay.c
View File

@@ -84,7 +84,7 @@ struct media_bay_info {
int cd_irq;
int cd_retry;
#endif
#if defined(CONFIG_BLK_DEV_IDE_PMAC) || defined(CONFIG_MAC_FLOPPY)
#if defined(CONFIG_BLK_DEV_IDE_PMAC)
int cd_index;
#endif
};
@@ -417,6 +417,7 @@ static void poll_media_bay(struct media_bay_info* bay)
}
}
#ifdef CONFIG_BLK_DEV_IDE_PMAC
int check_media_bay(struct device_node *which_bay, int what)
{
int i;
@@ -432,7 +433,6 @@ int check_media_bay(struct device_node *which_bay, int what)
}
EXPORT_SYMBOL(check_media_bay);
#ifdef CONFIG_BLK_DEV_IDE_PMAC
int check_media_bay_by_base(unsigned long base, int what)
{
int i;
@@ -556,7 +556,8 @@ static void media_bay_step(int i)
printk("mediabay %d, registering IDE...\n", i);
pmu_suspend();
ide_port_scan(bay->cd_port);
bay->cd_index = bay->cd_port->index;
if (bay->cd_port->present)
bay->cd_index = bay->cd_port->index;
pmu_resume();
}
if (bay->cd_index == -1) {

5
drivers/macintosh/smu.c
View File

@@ -484,12 +484,15 @@ int __init smu_init (void)
if (smu_cmdbuf_abs == 0) {
printk(KERN_ERR "SMU: Command buffer not allocated !\n");
of_node_put(np);
return -EINVAL;
}
smu = alloc_bootmem(sizeof(struct smu_device));
if (smu == NULL)
if (smu == NULL) {
of_node_put(np);
return -ENOMEM;
}
memset(smu, 0, sizeof(*smu));
spin_lock_init(&smu->lock);

13
drivers/macintosh/therm_adt746x.c
View File

@@ -562,18 +562,24 @@ thermostat_init(void)
therm_type = ADT7460;
else if (of_device_is_compatible(np, "adt7467"))
therm_type = ADT7467;
else
else {
of_node_put(np);
return -ENODEV;
}
prop = of_get_property(np, "hwsensor-params-version", NULL);
printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop,
(*prop == 1)?"":"un");
if (*prop != 1)
if (*prop != 1) {
of_node_put(np);
return -ENODEV;
}
prop = of_get_property(np, "reg", NULL);
if (!prop)
if (!prop) {
of_node_put(np);
return -ENODEV;
}
/* look for bus either by path or using "reg" */
if (strstr(np->full_name, "/i2c-bus@") != NULL) {
@@ -610,6 +616,7 @@ thermostat_init(void)
if (of_dev == NULL) {
printk(KERN_ERR "Can't register temperatures device !\n");
of_node_put(np);
return -ENODEV;
}