c4568d6c7ec7557fbe8656286aea29f67388f7d4 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/18e352e4a73465349711a9324767e1b2453383e2 18e352e4a73465349711a9324767e1b2453383e2 2009-01-28T10:49:30-08:00 2009-01-28T10:49:30-08:00 Linux 2.6.29-rc3 4c23b28f1ffc284be6fec0d4cb198b8371f681cd Linus Torvalds torvalds@linux-foundation.org 78a768b6ca40e104442ade090226ed4ee0e6cebf 4c456a67f501b8b15542c7c21c28812bf88f484b Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/c4568d6c7ec7557fbe8656286aea29f67388f7d4 c4568d6c7ec7557fbe8656286aea29f67388f7d4 2009-01-28T09:01:42-08:00 2009-01-28T09:01:42-08:00 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/mm: Fix handling of _PAGE_COHERENT in BAT setup code powerpc/pseries: Correct VIO bus accounting problem in CMO env. powerpc: More printing warning fixes for the l64 to ll64 conversion powerpc: Remove arch/ppc cruft from Kconfig powerpc: Printing fix for l64 to ll64 conversion: phyp_dump.c powerpc/embedded6xx: Update defconfigs powerpc/8xx: Update defconfigs powerpc/86xx: Update defconfigs powerpc/83xx: Update defconfigs powerpc/85xx: Update defconfigs powerpc/mpc8313erdb: fix kernel panic because mdio device is not probed powerpc/4xx: Update multi-board PowerPC 4xx defconfigs powerpc/44x: Update PowerPC 44x defconfigs powerpc/40x: Update PowerPC 40x defconfigs powerpc/85xx: Fix typo in mpc8572ds dts powerpc/44x: Warp patches for the new NDFC driver powerpc/4xx: DTS: Add Add'l SDRAM0 Compatible and Interrupt Info 783873ec85ca67f2de69986645b1b007231f8f6d Linus Torvalds torvalds@linux-foundation.org d8204ee2ad1c9babd7e33d4c118ec99a78a8442e add8240eedb586b9d885c324db7f98fc1a470f9f Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/78a768b6ca40e104442ade090226ed4ee0e6cebf 78a768b6ca40e104442ade090226ed4ee0e6cebf 2009-01-28T08:41:57-08:00 2009-01-28T08:41:57-08:00 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: fix 5329 ColdFire periphal addressing uclinux: add process name to allocation error message m68knommu: correct the mii calculations for 532x ColdFire FEC m68knommu: add ColdFire M532x to the FEC configuration options m68knommu: fix syscall restarting m68knommu: remove the obsolete and long unused comempci chip support m68knommu: remove the no longer used PCI support option m68knommu: remove obsolete and unused eLIA board m68knommu: set NO_DMA m68knommu: fix cache flushing for the 527x ColdFire processors m68knommu: fix ColdFire 5272 serial baud rates in mcf.c m68knommu: use one exist from execption f20e2d78107edd3f4247350b5e6d2e2560bff9d8 Linus Torvalds torvalds@linux-foundation.org 30b23634084d95781f7611c0713cb551a0c0a152 Kumar Gala galak@kernel.crashing.org http://github.com/github/linux-2.6/commit/d8204ee2ad1c9babd7e33d4c118ec99a78a8442e d8204ee2ad1c9babd7e33d4c118ec99a78a8442e 2009-01-28T07:50:14-08:00 2009-01-27T22:07:20-08:00 dmi: Fix build breakage Commit d7b1956fed33d30c4815e848fd7a143722916868 ("DMI: Introduce dmi_first_match to make the interface more flexible") introduced compile errors like the following when !CONFIG_DMI drivers/ata/sata_sil.c: In function 'sil_broken_system_poweroff': drivers/ata/sata_sil.c:713: error: implicit declaration of function 'dmi_first_match' drivers/ata/sata_sil.c:713: warning: initialization makes pointer from integer without a cast We just need a dummy version of dmi_first_match() to fix this all up. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> a1dbd71a8d3d087344e94a2cb819807d2b93bd51 Linus Torvalds torvalds@linux-foundation.org 152a649b647a8ef47bb74ff9e11850fa6001bedc Eric Anholt eric@anholt.net http://github.com/github/linux-2.6/commit/30b23634084d95781f7611c0713cb551a0c0a152 30b23634084d95781f7611c0713cb551a0c0a152 2009-01-28T07:50:14-08:00 2009-01-27T21:19:41-08:00 drm: Rip out the racy, unused vblank signal code. Schedule a vblank signal, kill the process, and we'll go walking over freed memory. Given that no open-source userland exists using this, nor have I ever heard of a consumer, just let this code die. Signed-off-by: Eric Anholt <eric@anholt.net> Requested-by: Linus Torvalds <torvalds@linux-foundation.org> Acked-by: Dave Airlie <airlied@linux.ie> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> fd4185cb0f0b46ca0069251144619b6e9e2031b0 Linus Torvalds torvalds@linux-foundation.org 69b052e828b5ff32df7f96d6d3268a069910c663 Gerhard Pircher gerhard_pircher@gmx.net http://github.com/github/linux-2.6/commit/4c456a67f501b8b15542c7c21c28812bf88f484b 4c456a67f501b8b15542c7c21c28812bf88f484b 2009-01-27T22:15:52-08:00 2009-01-22T22:51:28-08:00 powerpc/mm: Fix handling of _PAGE_COHERENT in BAT setup code _PAGE_COHERENT is now always set in _PAGE_RAM resp. PAGE_KERNEL. Thus it has to be masked out, if the BAT mapping should be non cacheable or CPU_FTR_NEED_COHERENT is not set. This will work on normal SMP setups because we force-set CPU_FTR_NEED_COHERENT as part of CPU_FTR_COMMON on SMP. Signed-off-by: Gerhard Pircher <gerhard_pircher@gmx.net> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> 0f1de24f488a59da4a7cc3445c89f8fe48b775aa Benjamin Herrenschmidt benh@kernel.crashing.org 4712fff9be0f4a41f7add146cee88a9b945215d7 Robert Jennings rcj@linux.vnet.ibm.com http://github.com/github/linux-2.6/commit/69b052e828b5ff32df7f96d6d3268a069910c663 69b052e828b5ff32df7f96d6d3268a069910c663 2009-01-27T22:15:52-08:00 2009-01-22T01:40:00-08:00 powerpc/pseries: Correct VIO bus accounting problem in CMO env. In the VIO bus code the wrappers for dma alloc_coherent and free_coherent calls are rounding to IOMMU_PAGE_SIZE. Taking a look at the underlying calls, the actual mapping is promoted to PAGE_SIZE. Changing the rounding in these two functions fixes under-reporting the entitlement used by the system. Without this change, the system could run out of entitlement before it believes it has and incur mapping failures at the firmware level. Also in the VIO bus code, the wrapper for dma map_sg is not exiting in an error path where it should. Rather than fall through to code for the success case, this patch adds the return that is needed in the error path. Signed-off-by: Robert Jennings <rcj@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> e2d013ded81fb9d8ad31a14b6ba4d8761727bd8b Benjamin Herrenschmidt benh@kernel.crashing.org 52c275fe70df8619e9430d01917d2e72e9011aec Stephen Rothwell sfr@canb.auug.org.au http://github.com/github/linux-2.6/commit/4712fff9be0f4a41f7add146cee88a9b945215d7 4712fff9be0f4a41f7add146cee88a9b945215d7 2009-01-27T22:15:52-08:00 2009-01-21T05:16:28-08:00 powerpc: More printing warning fixes for the l64 to ll64 conversion These are all powerpc specific drivers. res.start in fsl_elbc_nand.c needs to be cast since it may be either 32 or 64 bit. Thanks to Scott Wood for noticing. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Arnd Bergmann <arnd@arndb.de> call_edac bits in particular Acked-by: Olof Johansson <olof@lixom.net> pasemi_nand peices Acked-by: Scott Wood <scottwood@freescale.com> fsl_elbc fixes Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> 88f8d00da6500149ead00d3d5fe970531f0d44e5 Benjamin Herrenschmidt benh@kernel.crashing.org 802bdea875ed8c682bb30f71d762ce727ab8bb87 Josh Boyer jwboyer@linux.vnet.ibm.com http://github.com/github/linux-2.6/commit/52c275fe70df8619e9430d01917d2e72e9011aec 52c275fe70df8619e9430d01917d2e72e9011aec 2009-01-27T22:15:51-08:00 2009-01-19T21:16:36-08:00 powerpc: Remove arch/ppc cruft from Kconfig Remove some leftover cruft from the arch/ppc days Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com> Acked-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> 693d6df30577a9d02f84f3df9527652eaa6d1a41 Benjamin Herrenschmidt benh@kernel.crashing.org 6469c92e0a4879e57bccbbacb2b724672a4fa8fb Stephen Rothwell sfr@canb.auug.org.au http://github.com/github/linux-2.6/commit/802bdea875ed8c682bb30f71d762ce727ab8bb87 802bdea875ed8c682bb30f71d762ce727ab8bb87 2009-01-27T22:15:51-08:00 2009-01-18T15:33:38-08:00 powerpc: Printing fix for l64 to ll64 conversion: phyp_dump.c Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> 029254a331653eeb5f75788621df927487d0dba4 Benjamin Herrenschmidt benh@kernel.crashing.org 0411648e445d850ded24aba98f1774c417bf5658 0b21bcd5b52779be0c18a6c201ae8f060d3b2bf2 Benjamin Herrenschmidt benh@kernel.crashing.org http://github.com/github/linux-2.6/commit/6469c92e0a4879e57bccbbacb2b724672a4fa8fb 6469c92e0a4879e57bccbbacb2b724672a4fa8fb 2009-01-27T22:15:34-08:00 2009-01-27T22:15:34-08:00 Merge commit 'jwb/jwb-merge' into merge Manual merge of: arch/powerpc/configs/44x/warp_defconfig 65b3377bdea03342f64f5cd414d61824ff2cf354 Benjamin Herrenschmidt benh@kernel.crashing.org e4a7ca29039e615ce13a61b9c6abfb2aa394e9a1 b57cee20a5654620337d1a5e9b5f929a4a6c302c Benjamin Herrenschmidt benh@kernel.crashing.org http://github.com/github/linux-2.6/commit/0411648e445d850ded24aba98f1774c417bf5658 0411648e445d850ded24aba98f1774c417bf5658 2009-01-27T22:14:54-08:00 2009-01-27T22:14:54-08:00 Merge commit 'kumar/kumar-merge' into merge e7a79e6ea66cd38968e98b0966212d43e43a07a8 Benjamin Herrenschmidt benh@kernel.crashing.org e4a7ca29039e615ce13a61b9c6abfb2aa394e9a1 Casey Schaufler casey@schaufler-ca.com http://github.com/github/linux-2.6/commit/152a649b647a8ef47bb74ff9e11850fa6001bedc 152a649b647a8ef47bb74ff9e11850fa6001bedc 2009-01-27T20:13:32-08:00 2009-01-27T19:56:30-08:00 smackfs load append mode fix Given just how hard it is to find the code that uses MAY_APPEND it's probably not a big surprise that this went unnoticed for so long. The Smack rules loading code is incorrectly setting the MAY_READ bit when MAY_APPEND is requested. Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> Reviewed-by: James Morris <jmorris@namei.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ea626697e2cbf07f1cba973158b99125e98344ae Linus Torvalds torvalds@linux-foundation.org 843c04a0f63c74c6424e4b7d1ab85223b1ecf740 236dd4d18f293e3c9798f35c08272196826a980d Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/e4a7ca29039e615ce13a61b9c6abfb2aa394e9a1 e4a7ca29039e615ce13a61b9c6abfb2aa394e9a1 2009-01-27T16:08:04-08:00 2009-01-27T16:08:04-08:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (36 commits) USB: Driver for Freescale QUICC Engine USB Host Controller USB: option: add QUANTA HSDPA Data Card device ids USB: storage: Add another unusual_dev for off-by-one bug USB: unusual_dev: usb-storage needs to ignore a device USB: GADGET: fix !x & y USB: new id for ti_usb_3410_5052 driver USB: cdc-acm: Add another conexant modem to the quirks USB: 'option' driver - onda device MT503HS has wrong id USB: Remove ZTE modem from unusual_devices USB: storage: support of Dane-Elec MediaTouch USB device USB: usbmon: Implement compat_ioctl USB: add kernel-doc for wusb_dev in struct usb_device USB: ftdi_sio driver support of bar code scanner from Diebold USB: ftdi_sio: added Alti-2 VID and Neptune 3 PID USB: cp2101 device USB: usblp.c: add USBLP_QUIRK_BIDIR to Brother HL-1440 USB: remove vernier labpro from ldusb USB: CDC-ACM quirk for MTK GPS USB: cdc-acm: support some gps data loggers USB: composite: Fix bug: low byte of w_index is the usb interface number not the whole 2 bytes of w_index ... fc7f36ccb9ec01e95636c01b09589e88da5c520f Linus Torvalds torvalds@linux-foundation.org fc91be2ad03e0d243418414a854665274d560ca2 Anton Vorontsov avorontsov@ru.mvista.com http://github.com/github/linux-2.6/commit/236dd4d18f293e3c9798f35c08272196826a980d 236dd4d18f293e3c9798f35c08272196826a980d 2009-01-27T16:15:38-08:00 2009-01-09T18:03:21-08:00 USB: Driver for Freescale QUICC Engine USB Host Controller This patch adds support for the FHCI USB controller, as found in the Freescale MPC836x and MPC832x processors. It can support Full or Low speed modes. Quite a lot the hardware is doing by itself (SOF generation, CRC generation and checking), though scheduling and retransmission is on software's shoulders. This controller does not integrate the root hub, so this driver also fakes one-port hub. External hub is required to support more than one device. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 5e8f7dc48318e82c34758c1a807d034034b96221 Greg Kroah-Hartman gregkh@kvm.kroah.org aa23c8d616c33578fb99aa6a0effd6705b5d0fa1 Alex.Cheng@quantatw.com Alex.Cheng@quantatw.com http://github.com/github/linux-2.6/commit/fc91be2ad03e0d243418414a854665274d560ca2 fc91be2ad03e0d243418414a854665274d560ca2 2009-01-27T16:15:37-08:00 2009-01-22T00:01:57-08:00 USB: option: add QUANTA HSDPA Data Card device ids This patch adds the support for the QUANTA Q101 series HSDPA Data Card. With the vendor and product IDs are set properly, the data card can be detected and works fine. Signed-off-by: Alex Cheng <alex.cheng@quantatw.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> fa39f4c491a16ef5ada2bd6f3cb850ff232beec9 Greg Kroah-Hartman gregkh@kvm.kroah.org a83775b1465ce80af5610cbe80216432212bc7ee Phil Dibowitz phil@ipom.com http://github.com/github/linux-2.6/commit/aa23c8d616c33578fb99aa6a0effd6705b5d0fa1 aa23c8d616c33578fb99aa6a0effd6705b5d0fa1 2009-01-27T16:15:37-08:00 2009-01-20T14:42:52-08:00 USB: storage: Add another unusual_dev for off-by-one bug Argosy has released another device with the off-by-one sector. This is a harddrive with an internal cardreader which is affected. Based on a patch written by Martijn Hijdra <martijn.hijdra@gmail.com> Signed-off-by: Phil Dibowitz <phil@ipom.com> Cc: Martijn Hijdra <martijn.hijdra@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 1031ddafbe0674a2a32486cdf0064462a75842d8 Greg Kroah-Hartman gregkh@kvm.kroah.org 0df2479232eeea20c924350a11788c724b8c218d Phil Dibowitz phil@ipom.com http://github.com/github/linux-2.6/commit/a83775b1465ce80af5610cbe80216432212bc7ee a83775b1465ce80af5610cbe80216432212bc7ee 2009-01-27T16:15:37-08:00 2009-01-20T14:48:36-08:00 USB: unusual_dev: usb-storage needs to ignore a device This patch adds an unusual_devs entry for a Sony Ericsson modem. Like many other modems, we have to ignore the storage device in order to access the modem. At this time usb_modeswitch does not work with this device. Reported-by: The Solutor <thesolutor@gmail.com>. Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 6b5936a1b14cbae2546f198ad9448e160f94f016 Greg Kroah-Hartman gregkh@kvm.kroah.org 1a1fab513734b3a4fca1bee8229e5ff7e1cb873c Roel Kluin roel.kluin@gmail.com http://github.com/github/linux-2.6/commit/0df2479232eeea20c924350a11788c724b8c218d 0df2479232eeea20c924350a11788c724b8c218d 2009-01-27T16:15:37-08:00 2009-01-17T07:52:17-08:00 USB: GADGET: fix !x & y ! has a higher precedence than & Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 9661b73ee1791e83927634643a8dd84650bd5757 Greg Kroah-Hartman gregkh@kvm.kroah.org c89c60e9d6b306fb6963030abb3bd07cc3de66b2 Oliver Neukum oliver@neukum.org http://github.com/github/linux-2.6/commit/1a1fab513734b3a4fca1bee8229e5ff7e1cb873c 1a1fab513734b3a4fca1bee8229e5ff7e1cb873c 2009-01-27T16:15:37-08:00 2009-01-12T04:31:16-08:00 USB: new id for ti_usb_3410_5052 driver This adds a new device id Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 6324149bf5c5c2546d14445383796d6061832e37 Greg Kroah-Hartman gregkh@kvm.kroah.org 3b498a66a698c581535c0fcf1a8907f3fe9449cc Alan Cox alan@redhat.com http://github.com/github/linux-2.6/commit/c89c60e9d6b306fb6963030abb3bd07cc3de66b2 c89c60e9d6b306fb6963030abb3bd07cc3de66b2 2009-01-27T16:15:37-08:00 2009-01-11T11:53:10-08:00 USB: cdc-acm: Add another conexant modem to the quirks Another Conexant, another device with the same quirk Signed-off-by: Alan Cox <alan@redhat.com> Acked-by: Oliver Neukum <oliver@neukum.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ca617d652077ccf8abdb77cbf0b102254c6e5960 Greg Kroah-Hartman gregkh@kvm.kroah.org d547f13472adc99721d6eb756085276a8a342366 Marcel Sebek sebek64@post.cz http://github.com/github/linux-2.6/commit/3b498a66a698c581535c0fcf1a8907f3fe9449cc 3b498a66a698c581535c0fcf1a8907f3fe9449cc 2009-01-27T16:15:36-08:00 2008-12-28T05:06:50-08:00 USB: 'option' driver - onda device MT503HS has wrong id While trying to make GSM modem Onda MT503HS working, I found a mismatch between device id in the driver code (0x0200) and id in the lsusb output (0x2000). This patch fixed it for me, but I don't know if the original device id was also correct and the new ID should be added instead of replacing the old one. Signed-off-by: Marcel Sebek <sebek64@post.cz> Acked-by: Domenico Riccio <domenico.riccio@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> d84535d837b02f4fcdb528c81e0cb827b1f69a7c Greg Kroah-Hartman gregkh@kvm.kroah.org 649150926b01c57e45a0376cbc1d3aa98eabfde2 Phil Dibowitz phil@ipom.com http://github.com/github/linux-2.6/commit/d547f13472adc99721d6eb756085276a8a342366 d547f13472adc99721d6eb756085276a8a342366 2009-01-27T16:15:36-08:00 2009-01-11T09:46:20-08:00 USB: Remove ZTE modem from unusual_devices The ZTE modem entry causes usb-storage to ignore the device, but for some versions of the device, usb-storage mode is required to get to modem ode. For both kinds the tool: http://www.draisberghof.de/usb_modeswitch/ should work. Note that the various versions of the device have the same ProductId, VendorId, and bcdDevice number, so we cannot have the entry for some and not others. Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 0f94495e47cf85ce33190c840ae3361378a71f88 Greg Kroah-Hartman gregkh@kvm.kroah.org 7abce6bedc118eb39fe177c2c26be5d008505c14 Jean-Baptiste Onofre jb@nanthrax.net http://github.com/github/linux-2.6/commit/649150926b01c57e45a0376cbc1d3aa98eabfde2 649150926b01c57e45a0376cbc1d3aa98eabfde2 2009-01-27T16:15:36-08:00 2008-12-20T11:11:55-08:00 USB: storage: support of Dane-Elec MediaTouch USB device This adds another unusual_devs.h entry for a device that can't handle more than 64k reads/writes in a single command. Signed-off-by: Jean-Baptiste Onofre <jb@nanthrax.net> Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 17fbd389f3d49428c0f784844528a10a83a877ec Greg Kroah-Hartman gregkh@kvm.kroah.org 11e76ae0f3a82bbb6c06df8af2167af8b96a0584 Pete Zaitcev zaitcev@redhat.com http://github.com/github/linux-2.6/commit/7abce6bedc118eb39fe177c2c26be5d008505c14 7abce6bedc118eb39fe177c2c26be5d008505c14 2009-01-27T16:15:36-08:00 2008-12-20T11:56:08-08:00 USB: usbmon: Implement compat_ioctl Running a 32-bit usbmon(8) on 2.6.28-rc9 produces the following: ioctl32(usbmon:28563): Unknown cmd fd(3) cmd(400c9206){t:ffffff92;sz:12} arg(ffd3f458) on /dev/usbmon0 It happens because the compatibility mode was implemented for 2.6.18 and not updated for the fsops.compat_ioctl API. This patch relocates the pieces from under #ifdef CONFIG_COMPAT into compat_ioctl with no other changes except one new whitespace. Signed-off-by: Pete Zaitcev <zaitcev@redhat.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 21c1740f03c8a13227c4cac36a06c26ebcf36b90 Greg Kroah-Hartman gregkh@kvm.kroah.org ca80801bfb24f7a41fe4fade4d2cf7c73f0b2f09 Inaky Perez-Gonzalez inaky@linux.intel.com http://github.com/github/linux-2.6/commit/11e76ae0f3a82bbb6c06df8af2167af8b96a0584 11e76ae0f3a82bbb6c06df8af2167af8b96a0584 2009-01-27T16:15:36-08:00 2009-01-08T12:52:19-08:00 USB: add kernel-doc for wusb_dev in struct usb_device Reported by Randy Dunlap from a warning on the v2.6.29 merge window. Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com> Cc: David Vrabel <david.vrabel@csr.com> Cc: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> d1ab0215a1ab219df1712a65b6755114a2ca782a Greg Kroah-Hartman gregkh@kvm.kroah.org 45eeff848bdfac96dc77aa722dda7c6cee6184f4 Mhayk Whandson eu@mhayk.com.br http://github.com/github/linux-2.6/commit/ca80801bfb24f7a41fe4fade4d2cf7c73f0b2f09 ca80801bfb24f7a41fe4fade4d2cf7c73f0b2f09 2009-01-27T16:15:36-08:00 2009-01-09T02:48:16-08:00 USB: ftdi_sio driver support of bar code scanner from Diebold Added the product id of bcs(bar code scanner) from Diebold Procomp Brazil. Signed-off-by: Mhayk Whandson <eu@mhayk.com.br> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 6acc70e5f17de21cfc492ef361dbbfa9928b885a Greg Kroah-Hartman gregkh@kvm.kroah.org 877e262c4e251352771cc391760a12665b5b210b Robie Basak rb-oss-1@justgohome.co.uk http://github.com/github/linux-2.6/commit/45eeff848bdfac96dc77aa722dda7c6cee6184f4 45eeff848bdfac96dc77aa722dda7c6cee6184f4 2009-01-27T16:15:36-08:00 2009-01-12T15:05:59-08:00 USB: ftdi_sio: added Alti-2 VID and Neptune 3 PID This patch adds the vendor and product ID for the Alti-2 Neptune 3 (http://www.alti-2.com) which uses the FTDI chip. Signed-off-by: Robie Basak <rb-oss-1@justgohome.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> fc3680cc3edbdc63e8523f73234f27e0937f10d7 Greg Kroah-Hartman gregkh@kvm.kroah.org 06a743bfc42660f27fde5f24d7471e1eb4c71218 Tomasz K eros81@o2.pl http://github.com/github/linux-2.6/commit/877e262c4e251352771cc391760a12665b5b210b 877e262c4e251352771cc391760a12665b5b210b 2009-01-27T16:15:36-08:00 2009-01-04T03:47:11-08:00 USB: cp2101 device My girl use modem GSM (EDGE) Commanader 2 on iPlus Polsih provider, PLEASE add this vendor=0x10C4 and product=0x822B to USB serial driver cp2101.c From: Tomasz K <eros81@o2.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> f97e557ef88142d4529b1197c1ebac2bdd92b713 Greg Kroah-Hartman gregkh@kvm.kroah.org 296361ec3abbba7621e9fff01a572ac0873da903 Brandon Philips brandon@ifup.org http://github.com/github/linux-2.6/commit/06a743bfc42660f27fde5f24d7471e1eb4c71218 06a743bfc42660f27fde5f24d7471e1eb4c71218 2009-01-27T16:15:36-08:00 2009-01-05T08:30:39-08:00 USB: usblp.c: add USBLP_QUIRK_BIDIR to Brother HL-1440 My Brother HL-1440 would print one document before CUPS would stop printing with the error "Printer not connected; will retry in 30 seconds...". I traced this down to the CUPS usb backend getting an EIO out of usblp on the IOCNR_GET_DEVICE_ID IOCTL. Adding the USBLP_QUIRK_BIDIR fixes the problem but is it the right solution? output from strace /usr/lib/cups/backend/usb after printing a document (Note: SNDCTL_DSP_SYNC == IOCNR_GET_DEVICE_ID): before patch open("/dev/usb/lp0", O_RDWR|O_EXCL) = 3 ioctl(3, SNDCTL_DSP_SYNC, 0x7fff2478cef0) = -1 EIO (Input/output error) after patch open("/dev/usb/lp0", O_RDWR|O_EXCL) = 3 ioctl(3, SNDCTL_DSP_SYNC, 0x7fffb8d474c0) = 0 Possibly related bug: https://bugs.launchpad.net/ubuntu/+source/cupsys/+bug/35638 Signed-off-by: Brandon Philips <bphilips@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> c53220d6772b6af8dbff63234893fb3998ce4814 Greg Kroah-Hartman gregkh@kvm.kroah.org