Commit 66c7d2f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SUNHME]: Fix module unload.
  [SUNLANCE]: Fix module unload.
  [SUNQE]: Fix MAC address assignment.
  [SBUS] vfc_dev.c: kzalloc
parents 36e82dfd c3b99f0d

drivers/net/sunhme.c

+1 −1
Original line number Diff line number Diff line
@@ -3314,7 +3314,7 @@ static int __devexit hme_sbus_remove(struct of_device *dev) 
	struct happy_meal *hp = dev_get_drvdata(&dev->dev);

	struct net_device *net_dev = hp->dev;



	unregister_netdevice(net_dev);

	unregister_netdev(net_dev);



	/* XXX qfe parent interrupt... */

drivers/net/sunlance.c

+2 −2
Original line number Diff line number Diff line
@@ -1550,7 +1550,7 @@ static int __exit sunlance_sun4_remove(void) 
	struct lance_private *lp = dev_get_drvdata(&sun4_sdev.ofdev.dev);

	struct net_device *net_dev = lp->dev;



	unregister_netdevice(net_dev);

	unregister_netdev(net_dev);



	lance_free_hwresources(lp);
@@ -1590,7 +1590,7 @@ static int __devexit sunlance_sbus_remove(struct of_device *dev) 
	struct lance_private *lp = dev_get_drvdata(&dev->dev);

	struct net_device *net_dev = lp->dev;



	unregister_netdevice(net_dev);

	unregister_netdev(net_dev);



	lance_free_hwresources(lp);

drivers/net/sunqe.c

+3 −1
Original line number Diff line number Diff line
@@ -845,6 +845,8 @@ static int __init qec_ether_init(struct sbus_dev *sdev) 
	if (!dev)

		return -ENOMEM;



	memcpy(dev->dev_addr, idprom->id_ethaddr, 6);



	qe = netdev_priv(dev);



	i = of_getintprop_default(sdev->ofdev.node, "channel#", -1);
@@ -960,7 +962,7 @@ static int __devexit qec_sbus_remove(struct of_device *dev) 
	struct sunqe *qp = dev_get_drvdata(&dev->dev);

	struct net_device *net_dev = qp->dev;



	unregister_netdevice(net_dev);

	unregister_netdev(net_dev);



	sbus_iounmap(qp->qcregs, CREG_REG_SIZE);

	sbus_iounmap(qp->mregs, MREGS_REG_SIZE);

drivers/sbus/char/vfc_dev.c

+1 −2
Original line number Diff line number Diff line
@@ -259,11 +259,10 @@ static int vfc_debug(struct vfc_dev *dev, int cmd, void __user *argp) 
		if (copy_from_user(&inout, argp, sizeof(inout)))

			return -EFAULT;



		buffer = kmalloc(inout.len, GFP_KERNEL);

		buffer = kzalloc(inout.len, GFP_KERNEL);

		if (buffer == NULL)

			return -ENOMEM;



		memset(buffer,0,inout.len);

		vfc_lock_device(dev);

		inout.ret=

			vfc_i2c_recvbuf(dev,inout.addr & 0xff