aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-23 10:51:40 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-23 10:51:40 -0400
commitd5a92dd43739f59f77247cfbcbefd229e2948131 (patch)
treea16124c41e4da74c2a5f8edbd278b96e9d295c71 /drivers
parentd0b72a0817b0164986d35366c8ffe92fd985f713 (diff)
parent4e8a5201506423e0241202de1349422af4260296 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [PKT_SCHED] netem: Orphan SKB when adding to queue. [NET]: kernel-doc fix for sock.h [NET]: Reduce sizeof(struct flowi) by 20 bytes. [IPv6] fib: initialize tb6_lock in common place to give lockdep a key [ATM] nicstar: Fix a bogus casting warning [ATM] firestream: handle thrown error [ATM]: No need to return void [ATM]: handle sysfs errors [DCCP] ipv6: Fix opt_skb leak. [DCCP]: Fix Oops in DCCPv6
Diffstat (limited to 'drivers')
-rw-r--r--drivers/atm/ambassador.c4
-rw-r--r--drivers/atm/firestream.c4
-rw-r--r--drivers/atm/horizon.c4
-rw-r--r--drivers/atm/nicstar.c4
-rw-r--r--drivers/pci/quirks.c4
5 files changed, 12 insertions, 8 deletions
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index 323592de047b..9fffa7af6db1 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -2452,8 +2452,8 @@ static int __init amb_module_init (void)
2452static void __exit amb_module_exit (void) 2452static void __exit amb_module_exit (void)
2453{ 2453{
2454 PRINTD (DBG_FLOW|DBG_INIT, "cleanup_module"); 2454 PRINTD (DBG_FLOW|DBG_INIT, "cleanup_module");
2455 2455
2456 return pci_unregister_driver(&amb_driver); 2456 pci_unregister_driver(&amb_driver);
2457} 2457}
2458 2458
2459module_init(amb_module_init); 2459module_init(amb_module_init);
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 40ab9b65fae9..697ad82f6634 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1002,6 +1002,10 @@ static int fs_open(struct atm_vcc *atm_vcc)
1002 r = ROUND_UP; 1002 r = ROUND_UP;
1003 } 1003 }
1004 error = make_rate (pcr, r, &tmc0, NULL); 1004 error = make_rate (pcr, r, &tmc0, NULL);
1005 if (error) {
1006 kfree(tc);
1007 return error;
1008 }
1005 } 1009 }
1006 fs_dprintk (FS_DEBUG_OPEN, "pcr = %d.\n", pcr); 1010 fs_dprintk (FS_DEBUG_OPEN, "pcr = %d.\n", pcr);
1007 } 1011 }
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index f59349206dd2..44268cba5a5a 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -2932,8 +2932,8 @@ static int __init hrz_module_init (void) {
2932 2932
2933static void __exit hrz_module_exit (void) { 2933static void __exit hrz_module_exit (void) {
2934 PRINTD (DBG_FLOW, "cleanup_module"); 2934 PRINTD (DBG_FLOW, "cleanup_module");
2935 2935
2936 return pci_unregister_driver(&hrz_driver); 2936 pci_unregister_driver(&hrz_driver);
2937} 2937}
2938 2938
2939module_init(hrz_module_init); 2939module_init(hrz_module_init);
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 632ede552761..bd0904594805 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -2759,7 +2759,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
2759{ 2759{
2760 ns_dev *card; 2760 ns_dev *card;
2761 pool_levels pl; 2761 pool_levels pl;
2762 int btype; 2762 long btype;
2763 unsigned long flags; 2763 unsigned long flags;
2764 2764
2765 card = dev->dev_data; 2765 card = dev->dev_data;
@@ -2859,7 +2859,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
2859 case NS_ADJBUFLEV: 2859 case NS_ADJBUFLEV:
2860 if (!capable(CAP_NET_ADMIN)) 2860 if (!capable(CAP_NET_ADMIN))
2861 return -EPERM; 2861 return -EPERM;
2862 btype = (int) arg; /* an int is the same size as a pointer */ 2862 btype = (long) arg; /* a long is the same size as a pointer or bigger */
2863 switch (btype) 2863 switch (btype)
2864 { 2864 {
2865 case NS_BUFTYPE_SMALL: 2865 case NS_BUFTYPE_SMALL:
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index e8a7f1b1b2bc..ecf8e4d6b9da 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1634,7 +1634,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1
1634 * is marked here since the boot video device will be the only enabled 1634 * is marked here since the boot video device will be the only enabled
1635 * video device at this point. 1635 * video device at this point.
1636 */ 1636 */
1637 1637#if 0
1638static void __devinit fixup_video(struct pci_dev *pdev) 1638static void __devinit fixup_video(struct pci_dev *pdev)
1639{ 1639{
1640 struct pci_dev *bridge; 1640 struct pci_dev *bridge;
@@ -1663,7 +1663,7 @@ static void __devinit fixup_video(struct pci_dev *pdev)
1663 } 1663 }
1664} 1664}
1665DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, fixup_video); 1665DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, fixup_video);
1666 1666#endif
1667 1667
1668static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end) 1668static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
1669{ 1669{