commit 032ebf2620ef99a4fedaa0f77dc2272095ac5863 tree 18a341e1548a304efea7543c715d23255ada6fa3 parent 18552b8f227bddf569dade5c69798a37839ea913 author Linus Torvalds Fri, 12 May 2006 18:42:09 -0700 committer Linus Torvalds Fri, 12 May 2006 18:42:09 -0700 Alternative fix for MMC oops on unmount after removal Make sure to clear the driverfs_dev pointer when we do del_gendisk() (on disk removal), so that other users that may still have a ref to the disk won't try to use the stale pointer. Also move the KOBJ_REMOVE uevent handler up, so that the uevent still has access to the driverfs_dev data. This all should hopefully fix the problems with MMC umounts after device removals that caused commit 56cf6504fc1c0c221b82cebc16a444b684140fb7 and its reversal (1a2acc9e9214699a99389e323e6686e9e0e2ca67). Original problem reported by Todd Blumer and others. Acked-by: Greg KH Cc: Russell King Cc: James Bottomley Cc: Erik Mouw Cc: Andrew Vasquez Cc: Todd Blumer Signed-off-by: Linus Torvalds commit 18552b8f227bddf569dade5c69798a37839ea913 tree 2538b43849d9ba6da32e1a309907c9ad488a939c parent faa88df860fdfad13afc99fc7201432f9263b3b5 parent bd89efc532fe41f867f848144cc8b42054ddf6f9 author Linus Torvalds Fri, 12 May 2006 15:39:32 -0700 committer Linus Torvalds Fri, 12 May 2006 15:39:32 -0700 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: [NEIGH]: Fix IP-over-ATM and ARP interaction. [TG3]: ethtool always report port is TP. commit faa88df860fdfad13afc99fc7201432f9263b3b5 tree 0c5b480922c4a2d65154f610ae04928790de96da parent 1b52fa98edd1c3e663ea4a06519e3d20976084a8 parent 586152560ae8df2a9babf1a8b667d7a145cb8208 author Linus Torvalds Fri, 12 May 2006 15:26:29 -0700 committer Linus Torvalds Fri, 12 May 2006 15:26:29 -0700 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: [SPARC]: Fix warning on prom_getproperty in openprom.c [SPARC]: Handle UNWIND_INFO properly. [SPARC64]: Update defconfig. [SPARC]: show device name in /proc/dvma_map [SPARC]: Remove duplicate symbol exports commit 1b52fa98edd1c3e663ea4a06519e3d20976084a8 tree 178d5fd1fe2230b39f49cd36f481024e49878eb1 parent 6f4bb3d8205d943acafa2f536f37131777524b67 author Sean Hefty Fri, 12 May 2006 14:57:52 -0700 committer Roland Dreier Fri, 12 May 2006 14:57:52 -0700 IB: refcount race fixes Fix race condition during destruction calls to avoid possibility of accessing object after it has been freed. Instead of waking up a wait queue directly, which is susceptible to a race where the object is freed between the reference count going to 0 and the wake_up(), use a completion to wait in the function doing the freeing. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6f4bb3d8205d943acafa2f536f37131777524b67 tree c91bbf0190eef4e36be82fed70a6cbd4f01694a3 parent be1fd94fd698e9dfa2676f688d4e9b034e0d4b9e author Roland Dreier Fri, 12 May 2006 14:57:52 -0700 committer Roland Dreier Fri, 12 May 2006 14:57:52 -0700 IB/ipath: Properly terminate PCI ID table The ipath driver's table of PCI IDs needs a { 0, } entry at the end. This makes all of the device aliases visible to userspace so hotplug loads the module for all supported devices. Without the patch, modinfo ipath_core only shows: alias: pci:v00001FC1d0000000Dsv*sd*bc*sc*i* instead of the correct: alias: pci:v00001FC1d00000010sv*sd*bc*sc*i* alias: pci:v00001FC1d0000000Dsv*sd*bc*sc*i* Signed-off-by: Roland Dreier Signed-off-by: Bryan O'Sullivan commit bd89efc532fe41f867f848144cc8b42054ddf6f9 tree fcf90049cb5a15bf6689cdbc6038c3fe22079009 parent ef34814426862c41c061520d4ac833be5914b5ba author Simon Kelley Fri, 12 May 2006 14:56:08 -0700 committer David S. Miller Fri, 12 May 2006 14:56:08 -0700 [NEIGH]: Fix IP-over-ATM and ARP interaction. The classical IP over ATM code maintains its own IPv4 <-> ARP table, using the standard neighbour-table code. The neigh_table_init function adds this neighbour table to a linked list of all neighbor tables which is used by the functions neigh_delete() neigh_add() and neightbl_set(), all called by the netlink code. Once the ATM neighbour table is added to the list, there are two tables with family == AF_INET there, and ARP entries sent via netlink go into the first table with matching family. This is indeterminate and often wrong. To see the bug, on a kernel with CLIP enabled, create a standard IPv4 ARP entry by pinging an unused address on a local subnet. Then attempt to complete that entry by doing ip neigh replace lladdr nud reachable Looking at the ARP tables by using ip neigh show will reveal two ARP entries for the same address. One of these can be found in /proc/net/arp, and the other in /proc/net/atm/arp. This patch adds a new function, neigh_table_init_no_netlink() which does everything the neigh_table_init() does, except add the table to the netlink all-arp-tables chain. In addition neigh_table_init() has a check that all tables on the chain have a distinct address family. The init call in clip.c is changed to call neigh_table_init_no_netlink(). Since ATM ARP tables are rather more complicated than can currently be handled by the available rtattrs in the netlink protocol, no functionality is lost by this patch, and non-ATM ARP manipulation via netlink is rescued. A more complete solution would involve a rtattr for ATM ARP entries and some way for the netlink code to give neigh_add and friends more information than just address family with which to find the correct ARP table. [ I've changed the assertion checking in neigh_table_init() to not use BUG_ON() while holding neigh_tbl_lock. Instead we remember that we found an existing tbl with the same family, and after dropping the lock we'll give a diagnostic kernel log message and a stack dump. -DaveM ] Signed-off-by: Simon Kelley Signed-off-by: David S. Miller commit 586152560ae8df2a9babf1a8b667d7a145cb8208 tree 18c02fc0987e4f42ea6ab212b01caebfda49be80 parent 06a1be167ea77c436657587e26cd4d7d6401784c author Martin Habets Fri, 12 May 2006 12:53:59 -0700 committer David S. Miller Fri, 12 May 2006 12:53:59 -0700 [SPARC]: Fix warning on prom_getproperty in openprom.c Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit ef34814426862c41c061520d4ac833be5914b5ba tree b844afa6b8c0f9ef5062c5a37462b1f47b858baf parent d649dafd0713f2f3dfe29baa783868db33aa2c11 author Karsten Keil Fri, 12 May 2006 12:49:08 -0700 committer David S. Miller Fri, 12 May 2006 12:49:08 -0700 [TG3]: ethtool always report port is TP. Even with fiber cards ethtool reports that the connected port is TP, the patch fix this. Signed-off-by: Karsten Keil Acked-by: Michael Chan Signed-off-by: David S. Miller commit 06a1be167ea77c436657587e26cd4d7d6401784c tree 1d9ed9094496a1e02bfe551631b03495db337a89 parent 1f8aa2f66b7253d1a42ead0142c7a00d2df5ac89 author David S. Miller Fri, 12 May 2006 12:45:50 -0700 committer David S. Miller Fri, 12 May 2006 12:45:50 -0700 [SPARC]: Handle UNWIND_INFO properly. For sparc32 we need R_SPARC_UA32 relocation support, for sparc64 we need the handle R_SPARC_DISP32 relocations. Based upon reports and initial patch by Martin Habets. Signed-off-by: David S. Miller commit be1fd94fd698e9dfa2676f688d4e9b034e0d4b9e tree fc19e966f53d2bc7202fd4565d999595515ce50b parent 0d38eddab9ce6de3a9d6d583043dfa97b6bc0d3b parent 95563d343fec8d3e2f667c95230ac4ab7674b757 author Linus Torvalds Fri, 12 May 2006 12:14:52 -0700 committer Linus Torvalds Fri, 12 May 2006 12:14:52 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: [PATCH] scx200_acb: Fix for the CS5535 errata [PATCH] scx200_acb: Fix resource name use after free [PATCH] scx200_acb: Fix return on init error commit 0d38eddab9ce6de3a9d6d583043dfa97b6bc0d3b tree 59f1f4d3712ce3658f7540704d64c8d8ad6d4635 parent 1a2acc9e9214699a99389e323e6686e9e0e2ca67 parent df3fccb14ad02c5fabe095a104a0323c223f2833 author Linus Torvalds Fri, 12 May 2006 12:14:19 -0700 committer Linus Torvalds Fri, 12 May 2006 12:14:19 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: [PATCH] USB: fix omninet driver bug [PATCH] USB: add ark3116 usb to serial driver [PATCH] usbserial: Fixes leak in serial_open() error path. [PATCH] usbserial: Fixes use-after-free in serial_open(). [PATCH] USB: Emagic USB firmware loading fixes [PATCH] USB: add an IBM USB keyboard to the HID_QUIRK_NOGET blacklist [PATCH] USB: Add Sieraa Wireless 580 evdo card to airprime.c [PATCH] USB: ftdi_sio: add device id for ACT Solutions HomePro ZWave interface [PATCH] USB: ftdi_sio: Add support for HCG HF Dual ISO RFID Reader [PATCH] USB: ub oops in block_uevent [PATCH] USB: usbcore: don't check the device's power source [PATCH] USB: fix OHCI PM regression [PATCH] USB: pegasus fixes (logstorm, suspend) [PATCH] USBATM: fix modinfo output [PATCH] USBATM: change the default speedtouch iso altsetting [PATCH] USB: fix bug in ohci-hcd.c ohci_restart() commit 1a2acc9e9214699a99389e323e6686e9e0e2ca67 tree 8f8072ba0624ceb63ac0115a81d85435323fe79c parent d8c3291c73b958243b33f8509d4507e76dafd055 author Linus Torvalds Fri, 12 May 2006 12:08:46 -0700 committer Linus Torvalds Fri, 12 May 2006 12:08:46 -0700 Revert "[BLOCK] Fix oops on removal of SD/MMC card" This reverts commit 56cf6504fc1c0c221b82cebc16a444b684140fb7. Both Erik Mouw and Andrew Vasquez independently pinpointed this commit as causing problems, where the slab cache for a driver is never released (most obviously causing problems when immediately re-loading that driver, resulting in a "kmem_cache_create: duplicate cache " message, but it can also cause other trouble). James Bottomley dug into it, and reports: "OK, here's the scoop. The problem patch adds a get of driverfs_dev in add_disk(), but doesn't put it again until disk_release() (which occurs on final put_disk() of the gendisk). However, in SCSI, the driverfs_dev is the sdev_gendev. That means there's a reference held on sdev_gendev until final disk put. Unfortunately, we use the driver model driver_remove to trigger del_gendisk (which removes the gendisk from visibility and decrements the refcount), so we've introduced an unbreakable deadlock in the reference counting with this. I suggest simply reversing this patch at the moment. If Russell and Jens can tell me what they're trying to do I'll see if there's another way to do it." so hereby the patch gets reverted, waiting for a better fix. Cc: Jens Axboe Cc: Russell King Cc: James Bottomley Cc: Erik Mouw Cc: Andrew Vasquez Signed-off-by: Linus Torvalds commit df3fccb14ad02c5fabe095a104a0323c223f2833 tree 4db98656e7dedd27139bdb5de5e85ee847695b4a parent 815ddc99dd8108908d14c699a37d0f5974da6def author Greg Kroah-Hartman Tue, 02 May 2006 08:44:45 +0200 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:10 -0700 [PATCH] USB: fix omninet driver bug I introduced this way back in 2.6.13 when adding the port lock logic. This device talks out through different "ports" all at the same time, so the lock logic was wrong, preventing any data from ever being sent properly. Thanks a lot to Bernhard Reiter for being patient and helping with debugging this. Cc: Bernhard Reiter Signed-off-by: Greg Kroah-Hartman commit 815ddc99dd8108908d14c699a37d0f5974da6def tree d1e82ecdb93e1da6c9f370c8489ff63945e2d70b parent 71a84163ca6b4e36744978385e94150af32f9d75 author Greg Kroah-Hartman Fri, 12 May 2006 11:05:29 -0700 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] USB: add ark3116 usb to serial driver Based on Simon's original driver, with some minor code cleanups and tidying by me. Cc: Simon Schulz Signed-off-by: Greg Kroah-Hartman commit 71a84163ca6b4e36744978385e94150af32f9d75 tree 2f00bcc4c102660e55c2ff840ce4db6d44ede988 parent 704936a25bda9bb12e35bb222d5e3f26186dc279 author Luiz Fernando Capitulino Thu, 11 May 2006 22:34:24 -0300 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] usbserial: Fixes leak in serial_open() error path. If serial_open() fails at the port assignment or mutex_lock_interruptible() is interrupted, the 'serial' object will never be freed. We should call kref_put() when those errors happens. Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit 704936a25bda9bb12e35bb222d5e3f26186dc279 tree 723b247a002e47be72d4ba203277870de0fea220 parent 16c23f7d88cbcce491f9370b2846fad66e8ef319 author Luiz Fernando Capitulino Thu, 11 May 2006 22:34:17 -0300 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] usbserial: Fixes use-after-free in serial_open(). If the device is disconnected while serial_open() is executing and either try_module_get() or the device specific open function fails, the kref_put() call in the 'bailout_kref_put' label will free the memory pointed out by 'port'. The subsequent dereferences in the 'bailout_kref_put' label will be invalid. The fix is just to assure kref_put() is called after any 'port' usage. Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit 16c23f7d88cbcce491f9370b2846fad66e8ef319 tree 7e69ad84548acabb0bebcfd594c1986292947d83 parent 332bbf613868a5d5938ad9fb7436b2beae72d53d author Monty Tue, 09 May 2006 12:37:22 -0700 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] USB: Emagic USB firmware loading fixes It's become apparent as machines get faster that the emagic kernel firmware loaders (based on the ezusb loader) have a reset race. a 400MHz TiBook never tripped it, but a 2GHz Pentium M seems to hit it about 30% of the time. The bug is seen as a hung USB box and the kernel error: drivers/usb/misc/emi62.c: emi62_load_firmware - error loading firmware: error = -110 The patch below inserts a delay after deasserting reset to allow the box to settle before a new command is issued. This affects only device startup. Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 332bbf613868a5d5938ad9fb7436b2beae72d53d tree 02fc85e7046a4a586e5a1a91f3cb3dcf8a8dcf28 parent b68f7de02ae380ddb4e5e457e3fe945ddfd0aa08 author Olaf Hering Fri, 05 May 2006 11:07:21 +0200 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:09 -0700 [PATCH] USB: add an IBM USB keyboard to the HID_QUIRK_NOGET blacklist After recent changes, the USB keyboard as shipped with IBM pSeries systems does not work anymore, unless the keyboard is replugged after reboot. Adding this model to the blacklist fixes it. Signed-off-by: Olaf Hering Signed-off-by: Greg Kroah-Hartman commit b68f7de02ae380ddb4e5e457e3fe945ddfd0aa08 tree 671bd42200534fcb638838d19f4ec84bdc33925e parent 72a9f958421a519e69b3e7b409948c3a294f4a32 author Ken Brush Mon, 08 May 2006 20:24:12 -0500 committer Greg Kroah-Hartman Fri, 12 May 2006 11:58:08 -0700 [PATCH] USB: Add Sieraa Wireless 580 evdo card to airprime.c This adds the Sierra Wireless card to airprime.c. I tested this on my laptop. Signed-off-by: Ken Brush Signed-off-by: Greg Kroah-Hartman commit 95563d343fec8d3e2f667c95230ac4ab7674b757 tree 4e0c4f18ff45abe5f691f860633ed0a6bfbcd65b parent b33d0798e6cfae1fcee75afc808fe5690a48a814 author Jordan Crouse Fri, 28 Apr 2006 22:53:30 +0200 committer Greg Kroah-Hartman Tue, 09 May 2006 13:04:21 -0700 [PATCH] scx200_acb: Fix for the CS5535 errata This is a fix for the CS5535 errata 111: When the SMBus controller tries to access a non-existing device, it sets the NEGACK bit, SMBus I/O offset 01h[4], to 1 after it detects no acknowledge at the ninth clock. The specification states that the bit can be cleared by writing a 1 to it, but under certain circumstances it is possible for this bit to not clear. Writing a 0 to the bit resets the internal state machine and clears the issue. Since all writable bits in ACBST are W1C bits (write-one-to-clear) the second write doesn't affect any other logic except the buggy NEGACK state machine. The second write clears an internal register which is responsible for "overwriting" the NEGACK bit in ACBST. Signed-off-by: Jordan Crouse Signed-off-by: Andrew Morton Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit b33d0798e6cfae1fcee75afc808fe5690a48a814 tree fee80034c1633f195c1f32493063208abde7d5ca parent 6f9c2963888e60e46a9e0bd09a25740abce29262 author Jean Delvare Wed, 26 Apr 2006 23:00:16 +0200 committer Greg Kroah-Hartman Tue, 09 May 2006 13:04:21 -0700 [PATCH] scx200_acb: Fix resource name use after free We can't pass a string on the stack to request_region. As soon as we leave the function that stack is gone and the string is lost. Let's use the same string we identify the i2c_adapter with instead, it's more simple, more consistent, and just works. This is the second half of fix to bug #6445. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 6f9c2963888e60e46a9e0bd09a25740abce29262 tree a6f6a310c409fefda006790a77c7ae0d559a33ca parent e515f048c46e457ef61ce9c8b56bd36e825a48a0 author Jean Delvare Wed, 26 Apr 2006 22:50:32 +0200 committer Greg Kroah-Hartman Tue, 09 May 2006 13:04:21 -0700 [PATCH] scx200_acb: Fix return on init error The scx200_acb driver shouldn't return failure after initialization if it successfully registered at least one i2c_adapter, else we are leaking resources. The driver was OK in that respect up to 2.6.16, a recent change broke it. This is part of the fix to bug #6445. Signed-off-by: Jean Delvare Cc: Ben Gardner Signed-off-by: Greg Kroah-Hartman commit 72a9f958421a519e69b3e7b409948c3a294f4a32 tree 52a2c09831f26a592c5490fa044620f904578414 parent 20a0f47e18c646bcc772282512fc59e56b2fc968 author Razvan Gavril Thu, 04 May 2006 11:35:49 +0300 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:56 -0700 [PATCH] USB: ftdi_sio: add device id for ACT Solutions HomePro ZWave interface Signed-off-by: Razvan Gavril Signed-off-by: Greg Kroah-Hartman commit 20a0f47e18c646bcc772282512fc59e56b2fc968 tree 552f6f3d30107ae7546463180d5589e93af1a967 parent 77ef6c4d6e23653a79eedacdd6d1d0da7083e59c author Ian Abbott Thu, 04 May 2006 11:34:25 +0100 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: ftdi_sio: Add support for HCG HF Dual ISO RFID Reader This patch adds support for ACG Identification Technologies GmbH's HF Dual ISO Reader (an RFID tag reader) to the ftdi_sio driver's device ID table. The product ID was supplied by anotonios (anton at goto10 dot org) on the ftdi-usb-sio-devel list and subsequently verified by myself (Ian Abbott). Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 77ef6c4d6e23653a79eedacdd6d1d0da7083e59c tree 5dd68fb616175ffcf2939beaef8ed06a43179173 parent 436f5762bcd4929825a0725d4bc78337e6fc0d8f author Pete Zaitcev Wed, 03 May 2006 00:16:00 -0700 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: ub oops in block_uevent In kernel 2.6.16, if a mounted storage device is removed, an oops happens because ub supplies an interface device (and kobject) to the block layer, but neglects to pin it. And apparently, the block layer expects its users to pin device structures. The code in ub was broken this way for years. But the bug was exposed only by 2.6.16 when it started to call block_uevent on close, which traverses device structures (kobjects actually). Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 436f5762bcd4929825a0725d4bc78337e6fc0d8f tree f2f709575ddec3b58d1c7c13af82bdcfc82dbfcf parent db4cefaaea4c6d67cdaebfd315abc791c5c9d22f author Alan Stern Tue, 02 May 2006 15:22:41 -0400 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: usbcore: don't check the device's power source The choose_configuration() routine contains code the determine the device's power source, so that configurations requiring external power can be ruled out if the device is running on bus power. Unfortunately it turns out that some devices have errors in their config descriptors and other devices don't like the GET_DEVICE_STATUS request. Since that information wasn't used for anything else, this patch (as673) removes the code, leaving only a comment. It fixes bugzilla entry #6448. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit db4cefaaea4c6d67cdaebfd315abc791c5c9d22f tree 111e4ada3f449fd71be268de7e5afbaf4299e333 parent 7e713b825610de9a9584c189c72e2d9f2326359c author David Brownell Mon, 01 May 2006 22:07:13 -0700 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: fix OHCI PM regression This fixes a small regression in USB controller power usage for many OHCI controllers, notably including every non-PCI version of OHCI: on those systems, the runtime autosuspend mechanism is no longer enabled. The change moves to saner defaults. All root hubs are expected to handle remote wakeup (and hence autosuspend), although drivers for buggy silicon may override that default. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 7e713b825610de9a9584c189c72e2d9f2326359c tree d0936b3d12c2185f537b339942719ca2cedbef9d parent 6275cdfa0fe032208937a3567ebb8bcfd42d20b1 author David Brownell Mon, 01 May 2006 14:02:45 -0700 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:55 -0700 [PATCH] USB: pegasus fixes (logstorm, suspend) Teach "pegasus" to handle a few of the disconnect fault paths without hundreds of usless syslog messages. Handle the carrier check workqueue entry even if the driver has not been opened. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 6275cdfa0fe032208937a3567ebb8bcfd42d20b1 tree dfb84d591316f8b3d21e724574d98359fd0260b1 parent 67c752b41a4238c1a2d7eebcd061ff8c1127d3e9 author Duncan Sands Fri, 28 Apr 2006 18:52:16 +0200 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:54 -0700 [PATCH] USBATM: fix modinfo output Because of the way stringify works, using an expression like 64 * 1024 for UDSL_MAX_BUF_SIZE results in 64 * 1024 turning up in the modinfo output instead of 65536. So use 65536 directly (this was the only way I found of fixing this). Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 67c752b41a4238c1a2d7eebcd061ff8c1127d3e9 tree b2a568a12e965fc76f276c108a0e7027e84eb6a3 parent 839ab1d4ce4dfd7e6c189391a82c584292488b41 author Duncan Sands Fri, 28 Apr 2006 18:44:06 +0200 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:54 -0700 [PATCH] USBATM: change the default speedtouch iso altsetting The maximum possible bandwidth for a speedtouch modem is about 7Mbaud. You can only get this by using isochronous urbs (enable_isoc=1) and altsetting 3. With the current default altsetting of 2, the modem maxes out at about 4Mbaud. So change the default altsetting to 3 when using isochronous urbs. It would be nice to base the altsetting on the detected line speed, but that's hard given the current design. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 839ab1d4ce4dfd7e6c189391a82c584292488b41 tree 052591e6d261b96052367fd9baaa2fcd1ae38d5f parent e515f048c46e457ef61ce9c8b56bd36e825a48a0 author David Brownell Wed, 26 Apr 2006 14:39:11 -0700 committer Greg Kroah-Hartman Mon, 08 May 2006 23:43:54 -0700 [PATCH] USB: fix bug in ohci-hcd.c ohci_restart() A loop on a power-lost resume path used the wrong index. I suspect khubd has been working around such bugs. Noticed by Andreas Mohr . Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1f8aa2f66b7253d1a42ead0142c7a00d2df5ac89 tree d5e65e11301d33e91e207efa44454350f8ba32f0 parent 4cfbd7eb24975e942c3b6c0119c953c3a7a5f787 author David S. Miller Mon, 08 May 2006 15:13:14 -0700 committer David S. Miller Mon, 08 May 2006 15:13:14 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 4cfbd7eb24975e942c3b6c0119c953c3a7a5f787 tree dbda6c396a00aa89beaedf2fb00d047c3335f825 parent bb3426ad6659282d9244d4909e69aa639d0360d0 author Martin Habets Sun, 07 May 2006 23:43:19 -0700 committer David S. Miller Sun, 07 May 2006 23:43:19 -0700 [SPARC]: show device name in /proc/dvma_map This patch will set the device name in a resource, which will be shown in /proc/dvma_map. Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit bb3426ad6659282d9244d4909e69aa639d0360d0 tree c46e768412146e7791d163664edc72ecffe7f99e parent 9d21f09ca03d1142f1988001f228d02581d8986c author Martin Habets Sun, 07 May 2006 23:04:06 -0700 committer David S. Miller Sun, 07 May 2006 23:04:06 -0700 [SPARC]: Remove duplicate symbol exports This patch resolves the following build warnings seen in 2.6.17-rc3: WARNING: vmlinux: 'sys_close' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'memchr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strstr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strnlen' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strrchr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strchr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcmp' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strncat' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcat' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strncpy' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcpy' exported twice. Previous export was in vmlinux Signed-off-by: Martin Habets Signed-off-by: David S. Miller