Commit 2b656999 authored by Anton Blanchard's avatar Anton Blanchard Committed by Linus Torvalds

[PATCH] ppc64: Fix real bugs uncovered by -Wno-uninitialized removal

The removal of -Wno-uninitialized on ppc64 revealed a number of real
bugs.
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 40e8ae74
......@@ -65,7 +65,8 @@ int iSeries_Device_ToggleReset(struct pci_dev *PciDev, int AssertTime,
AssertDelay = (5 * HZ) / 10;
else
AssertDelay = (AssertTime * HZ) / 10;
if (WaitDelay == 0)
if (DelayTime == 0)
WaitDelay = (30 * HZ) / 10;
else
WaitDelay = (DelayTime * HZ) / 10;
......
......@@ -427,7 +427,7 @@ static int hvcs_io(struct hvcs_struct *hvcsd)
struct tty_struct *tty;
char buf[HVCS_BUFF_LEN] __ALIGNED__;
unsigned long flags;
int got;
int got = 0;
int i;
spin_lock_irqsave(&hvcsd->lock, flags);
......@@ -945,7 +945,7 @@ static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address,
*/
struct hvcs_struct *hvcs_get_by_index(int index)
{
struct hvcs_struct *hvcsd;
struct hvcs_struct *hvcsd = NULL;
unsigned long flags;
spin_lock(&hvcs_structs_lock);
......@@ -1433,7 +1433,7 @@ static int __init hvcs_module_init(void)
" as a tty driver failed.\n");
hvcs_free_index_list();
put_tty_driver(hvcs_tty_driver);
return rc;
return -EIO;
}
hvcs_pi_buff = kmalloc(PAGE_SIZE, GFP_KERNEL);
......
......@@ -885,13 +885,16 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
mac_addr_p = (unsigned char *) vio_get_attribute(dev, VETH_MAC_ADDR, 0);
if(!mac_addr_p) {
ibmveth_error_printk("Can't find VETH_MAC_ADDR attribute\n");
printk(KERN_ERR "(%s:%3.3d) ERROR: Can't find VETH_MAC_ADDR "
"attribute\n", __FILE__, __LINE__);
return 0;
}
mcastFilterSize_p= (unsigned int *) vio_get_attribute(dev, VETH_MCAST_FILTER_SIZE, 0);
if(!mcastFilterSize_p) {
ibmveth_error_printk("Can't find VETH_MCAST_FILTER_SIZE attribute\n");
printk(KERN_ERR "(%s:%3.3d) ERROR: Can't find "
"VETH_MCAST_FILTER_SIZE attribute\n",
__FILE__, __LINE__);
return 0;
}
......
......@@ -449,7 +449,7 @@ static int rpaphp_disable_slot(struct pci_dev *dev)
static int disable_slot(struct hotplug_slot *hotplug_slot)
{
int retval;
int retval = -EINVAL;
struct slot *slot = (struct slot *)hotplug_slot->private;
dbg("%s - Entry: slot[%s]\n", __FUNCTION__, slot->name);
......
......@@ -186,7 +186,7 @@ static struct pci_dev *
rpaphp_pci_config_slot(struct device_node *dn, struct pci_bus *bus)
{
struct device_node *eads_first_child = dn->child;
struct pci_dev *dev;
struct pci_dev *dev = NULL;
int num;
dbg("Enter %s: dn=%s bus=%s\n", __FUNCTION__, dn->full_name, bus->name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment