commit 589f1e81bde732dd0b1bc5d01b6bddd4bcb4527b Merge: ce524c8... 9ee0be0... Author: Linus Torvalds Date: Wed Jul 18 18:38:25 2007 -0700 Merge branch 'isdn-fix' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'isdn-fix' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: ISDN HiSax: uninitialized return in hisax_cs_setup commit ce524c8360d60cc6d3f77986bd58c4448d2b1e3a Merge: 789c56b... f9e2922... Author: Linus Torvalds Date: Wed Jul 18 18:33:45 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: eHEA: Fix bonding support Blackfin ethernet driver: on chip ethernet MAC controller driver fix wrong argument of tc35815_read_plat_dev_addr() ARM/ETHER3: Handle multicast frames. SAA9730: Handle multicast frames. NI5010: Handle multicast frames. NS83820: Handle multicast frames. Fix RGMII-ID handling in gianfar Fix Vitesse RGMII-ID support Add phy-connection-type to gianfar nodes Fix Vitesse 824x PHY interrupt acking [PATCH] zd1211rw: Add ID for Siemens Gigaset USB Stick 54 [PATCH] zd1211rw: Add ID for Planex GW-US54GXS [PATCH] Update version ipw2200 stamp to 1.2.2 [PATCH] ipw2200: Fix ipw_isr() comments error on shared IRQ [PATCH] Fix ipw2200 set wrong power parameter causing firmware error [PATCH] ipw2100: Fix `iwpriv set_power` error [PATCH] softmac: Channel is listed twice in scan output commit 789c56b7f73218141b8004cb4f775eed8c514212 Merge: 7209a1d... 1ff8392... Author: Linus Torvalds Date: Wed Jul 18 18:32:28 2007 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (24 commits) [CIFS] merge conflict in fs/cifs/export.c [CIFS] Allow disabling CIFS Unix Extensions as mount option [CIFS] More whitespace/formatting fixes (noticed by checkpatch) [CIFS] Typo in previous patch [CIFS] zero_user_page() conversions [CIFS] use simple_prepare_write to zero page data [CIFS] Fix build break - inet.h not included when experimental ifdef off [CIFS] Add support for new POSIX unlink [CIFS] whitespace/formatting fixes [CIFS] Fix oops in cifs_create when nfsd server exports cifs mount [CIFS] whitespace cleanup [CIFS] Fix packet signatures for NTLMv2 case [CIFS] more whitespace fixes [CIFS] more whitespace cleanup [CIFS] whitespace cleanup [CIFS] whitespace cleanup [CIFS] ipv6 support no longer experimental [CIFS] Mount should fail if server signing off but client mount option requires it [CIFS] whitespace fixes [CIFS] Fix sign mount option and sign proc config setting ... commit 7209a1dc2557b127ee75a49e200812366532510d Merge: 29e7ee3... ede178e... Author: Linus Torvalds Date: Wed Jul 18 18:28:34 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/docs-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/docs-2.6: zh_CN/HOWTO: update URLs of git trees Chinese translation of Documentation/stable_api_nonsense.txt HOWTO: add Chinese translation of Documentation/HOWTO Documentation: add Japanese translated stable_api_nonsense.txt HOWTO: add Japanese translation of Documentation/HOWTO commit 29e7ee378e2327c808ede66dec4d4d964f4d375f Merge: fc15bc8... 967e35d... Author: Linus Torvalds Date: Wed Jul 18 18:28:08 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: sysfs: cosmetic clean up on node creation failure paths sysfs: kill an extra put in sysfs_create_link() failure path Driver core: check return code of sysfs_create_link() HOWTO: Add the knwon_regression URI to the documentation dev_vdbg() documentation dev_vdbg(), available with -DVERBOSE_DEBUG sysfs: make sysfs_init_inode() static sysfs: fix sysfs root inode nlink accounting Documentation fix devres.txt: lib/iomap.c -> lib/devres.c sysfs: avoid kmem_cache_free(NULL) PM: remove deprecated dpm_runtime_* routines PM: Remove deprecated sysfs files Driver core: accept all valid action-strings in uevent-trigger debugfs: remove rmdir() non-empty complaint commit fc15bc817eecd5c13581adab2a182c07edededa0 Merge: a8dcf12... bc4c4f4... Author: Linus Torvalds Date: Wed Jul 18 18:27:50 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/uio-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/uio-2.6: UIO: Hilscher CIF card driver UIO: Documentation UIO: Add the User IO core code commit a8dcf12f9e8ba113251c04d602f1695d537fb142 Merge: d796e64... 6924c55... Author: Linus Torvalds Date: Wed Jul 18 18:27:00 2007 -0700 Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux * 'for-linus' of git://linux-nfs.org/~bfields/linux: locks: fix vfs_test_lock() comment locks: make posix_test_lock() interface more consistent nfs: disable leases over NFS gfs2: stop giving out non-cluster-coherent leases locks: export setlease to filesystems locks: provide a file lease method enabling cluster-coherent leases locks: rename lease functions to reflect locks.c conventions locks: share more common lease code locks: clean up lease_alloc() locks: convert an -EINVAL return to a BUG leases: minor break_lease() comment clarification commit d796e641a3eea2109381d6b0af533454f44916fa Merge: 412edf6... 43509d1... Author: Linus Torvalds Date: Wed Jul 18 18:26:18 2007 -0700 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: (29 commits) IB/mthca: Simplify use of size0 in work request posting IB/mthca: Factor out setting WQE UD segment entries IB/mthca: Factor out setting WQE remote address and atomic segment entries IB/mlx4: Factor out setting other WQE segments IB/mlx4: Factor out setting WQE data segment entries IB/mthca: Factor out setting WQE data segment entries IB/mlx4: Return receive queue sizes for userspace QPs from query QP IB/mlx4: Increase max outstanding RDMA reads as target RDMA/cma: Remove local write permission from QP access flags IB/mthca: Use uninitialized_var() for f0 IB/cm: Make internal function cm_get_ack_delay() static IB/ipath: Remove ipath_get_user_pages_nocopy() IB/ipath: Make a few functions static mlx4_core: Reset device when internal error is detected IB/iser: Make a couple of functions static IB/mthca: Fix printk format used for firmware version in warning IB/mthca: Schedule MSI support for removal IB/ehca: Fix warnings issued by checkpatch.pl IB/ehca: Restructure ehca_set_pagebuf() IB/ehca: MR/MW structure refactoring ... commit 1ff8392c32a2645d2665ca779ecb91bb29361c13 Merge: 70b315b... 5bae7ac... Author: Steve French Date: Thu Jul 19 00:38:57 2007 +0000 Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: fs/cifs/export.c commit 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 Author: Steve French Date: Thu Jul 19 00:32:25 2007 +0000 [CIFS] merge conflict in fs/cifs/export.c Signed-off-by: Steve French commit c18c842b1fdf527717303a4e173cbece7ab2deb8 Author: Steve French Date: Wed Jul 18 23:21:09 2007 +0000 [CIFS] Allow disabling CIFS Unix Extensions as mount option Previously the only way to do this was to umount all mounts to that server, turn off a proc setting (/proc/fs/cifs/LinuxExtensionsEnabled). Fixes Samba bugzilla bug number: 4582 (and also 2008) Signed-off-by: Steve French commit 6924c55492c904695f13c552c461c2211f4fdd6a Author: J. Bruce Fields Date: Fri May 11 16:22:50 2007 -0400 locks: fix vfs_test_lock() comment Thanks to Doug Chapman for pointing out that the comment here is inconsistent with the function prototype. Signed-off-by: "J. Bruce Fields" commit 6d34ac199a4af5c678a3a8f3275aeb2586b72da3 Author: J. Bruce Fields Date: Fri May 11 16:09:32 2007 -0400 locks: make posix_test_lock() interface more consistent Since posix_test_lock(), like fcntl() and ->lock(), indicates absence or presence of a conflict lock by setting fl_type to, respectively, F_UNLCK or something other than F_UNLCK, the return value is no longer needed. Signed-off-by: "J. Bruce Fields" commit 370f6599e8bc03fd9fc6d1a1be00ae0c6373ca59 Author: J. Bruce Fields Date: Fri Jun 8 15:23:34 2007 -0400 nfs: disable leases over NFS As Peter Staubach says elsewhere (http://marc.info/?l=linux-kernel&m=118113649526444&w=2): > The problem is that some file system such as NFSv2 and NFSv3 do > not have sufficient support to be able to support leases correctly. > In particular for these two file systems, there is no over the wire > protocol support. > > Currently, these two file systems fail the fcntl(F_SETLEASE) call > accidentally, due to a reference counting difference. These file > systems should fail more consciously, with a proper error to > indicate that the call is invalid for them. Define an nfs setlease method that just returns -EINVAL. If someone can demonstrate a real need, perhaps we could reenable them in the presence of the "nolock" mount option. Signed-off-by: "J. Bruce Fields" Cc: Peter Staubach Cc: Trond Myklebust commit 60446067ba7a8e890a91db3b4a7436fe0ebd2dee Author: Marc Eshel Date: Mon Jan 15 18:33:36 2007 -0500 gfs2: stop giving out non-cluster-coherent leases Since gfs2 can't prevent conflicting opens or leases on other nodes, we probably shouldn't allow it to give out leases at all. Put the newly defined lease operation into use in gfs2 by turning off lease, unless we're using the "nolock' locking module (in which case all locking is local anyway). Signed-off-by: Marc Eshel Signed-off-by: J. Bruce Fields Cc: Steven Whitehouse commit 4698afe8e3a725576366f86560a8a8242b21b9f7 Author: J. Bruce Fields Date: Wed Jul 4 17:21:37 2007 -0400 locks: export setlease to filesystems Export setlease so it can used by filesystems to implement their lease methods. Signed-off-by: "J. Bruce Fields" commit f9ffed26d6f3e6ac9988947242821579d615fda7 Author: J. Bruce Fields Date: Tue Nov 14 15:51:40 2006 -0500 locks: provide a file lease method enabling cluster-coherent leases Currently leases are only kept locally, so there's no way for a distributed filesystem to enforce them against multiple clients. We're particularly interested in the case of nfsd exporting a cluster filesystem, in which case nfsd needs cluster-coherent leases in order to implement delegations correctly. Also add some documentation. Signed-off-by: J. Bruce Fields commit a9933cea7a1d80dd9efae9f1acd857f5dce742b9 Author: J. Bruce Fields Date: Thu Jun 7 17:09:49 2007 -0400 locks: rename lease functions to reflect locks.c conventions We've been using the convention that vfs_foo is the function that calls a filesystem-specific foo method if it exists, or falls back on a generic method if it doesn't; thus vfs_foo is what is called when some other part of the kernel (normally lockd or nfsd) wants to get a lock, whereas foo is what filesystems call to use the underlying local functionality as part of their lock implementation. So rename setlease to vfs_setlease (which will call a filesystem-specific setlease after a later patch) and __setlease to setlease. Also, vfs_setlease need only be GPL-exported as long as it's only needed by lockd and nfsd. Signed-off-by: "J. Bruce Fields" commit 6d5e8b05caf074ae5676ad9aaf92e381226a14a7 Author: J. Bruce Fields Date: Thu May 31 17:03:46 2007 -0400 locks: share more common lease code Share more code between setlease (used by nfsd) and fcntl. Also some minor cleanup. Signed-off-by: "J. Bruce Fields" Acked-by: Christoph Hellwig commit e32b8ee27b486f682a6d13533cfe6549c8abcdef Author: J. Bruce Fields Date: Thu Mar 1 14:34:35 2007 -0500 locks: clean up lease_alloc() Return the newly allocated structure as the return value instead of using a struct ** parameter. Signed-off-by: J. Bruce Fields commit d2ab0b0c4c2570921a9ec1eff1e3a5143e05b231 Author: J. Bruce Fields Date: Sat Jun 30 12:40:32 2007 -0400 locks: convert an -EINVAL return to a BUG There's no point trying to return an error in these cases, which all represent bugs in the callers. Signed-off-by: J. Bruce Fields commit 87250dd26a34c65ae31d08837174222889007641 Author: david m. richter Date: Wed May 9 16:10:27 2007 -0400 leases: minor break_lease() comment clarification clarify that break_lease() checks for presence of any lock, not just leases. Signed-off-by: David M. Richter Signed-off-by: "J. Bruce Fields" commit ede178e216b5dd9200cf2c483c746e0672fbe503 Author: Li Yang Date: Tue Jun 26 11:15:27 2007 +0800 zh_CN/HOWTO: update URLs of git trees Addressing patch from Stefan Richter: HOWTO: update URLs of git trees (It will be better if we update this to commit-id later) Signed-off-by: Li Yang Signed-off-by: Greg Kroah-Hartman commit 29a68ee73ec6a5510cbf9d803cbf6190b615e276 Author: TripleX Date: Fri Jun 22 01:20:36 2007 +0800 Chinese translation of Documentation/stable_api_nonsense.txt This is a Chinese translated version of Documentation/stable_api_nonsense.txt. From: TripleX Signed-off-by: WANG Cong Signed-off-by: Li Yang Signed-off-by: Greg Kroah-Hartman commit 0da1fa0aa2b438aaee6764742d45766d6a9283bc Author: Li Yang Date: Thu Jun 21 22:40:17 2007 +0800 HOWTO: add Chinese translation of Documentation/HOWTO This is a Chinese translated version of Documentation/HOWTO. Currently Chinese involvement in Linux kernel is very low, especially comparing to its largest population base. Language could be the main obstacle. Hope this document will help more Chinese to contribute to Linux kernel. Signed-off-by: Li Yang Signed-off-by: TripleX Chung Signed-off-by: Maggie Chen Signed-off-by: WANG Cong Signed-off-by: Greg Kroah-Hartman commit 5d329e6bb513323bde40668a31e1d734a16eb7b2 Author: IKEDA, Munehiro Date: Tue Jun 12 09:46:04 2007 +0900 Documentation: add Japanese translated stable_api_nonsense.txt Signed-off-by: IKEDA, Munehiro Signed-off-by: Greg Kroah-Hartman commit 73fd625371db08377b7053816c7e486b9bffc18d Author: Tsugikazu Shibata Date: Tue Jun 12 17:16:12 2007 +0900 HOWTO: add Japanese translation of Documentation/HOWTO Add the japanese translation of the Documentation/HOWTO file. Signed-off-by: Tsugikazu Shibata Cc: IKEDA Munehiro Signed-off-by: Greg Kroah-Hartman commit bc4c4f45acbe1f1528d654b0b1793f25c175bf8f Author: Hans-Jürgen Koch Date: Fri Mar 2 13:03:12 2007 +0100 UIO: Hilscher CIF card driver this is a patch that adds support for Hilscher CIF DeviceNet and Profibus cards. I tested it on a Kontron CPX board, and Thomas reviewed it. You can find the user space part here: http://www.osadl.org/projects/downloads/UIO/user/cif-0.1.0.tar.gz Notes: cif_api.c is the main file you want to look at. It contains the functions to open, close, mmap and so on. cif_dps.c adds functions specific to Profibus cards, and cif_dn.c contains functions for DeviceNet cards. cif.c is a universal playground, it's just a small test program. The user space part of this UIO driver is still work in progress, and not everything is tested yet. At the moment, the thread in cif_api.c contains some code that artificially makes the card generate interrupts, this was added for testing and will be removed later. But the driver already contains all the functions needed for useful operation, so it gives a good idea of how such a thing looks like. For comparison, here's what you get from the manufacturer (www.hilscher.com) when you ask for a Linux 2.6 driver: http://www.tglx.de/private/hjk/cif-orig-2.6.tar.bz2 WARNING: Don't look at the code for too long, you might become sick :-) Signed-off-by: Hans-Jürgen Koch Signed-off-by: Greg Kroah-Hartman commit e3e0a28b5b067d16b8e2e5ddaedecda5bd0c3ec2 Author: Hans J. Koch Date: Mon Dec 11 16:59:59 2006 +0100 UIO: Documentation Documentation for the UIO interface From: Hans J. Koch Signed-off-by: Greg Kroah-Hartman commit beafc54c4e2fba24e1ca45cdb7f79d9aa83e3db1 Author: Hans J. Koch Date: Thu Dec 7 10:58:29 2006 +0100 UIO: Add the User IO core code This interface allows the ability to write the majority of a driver in userspace with only a very small shell of a driver in the kernel itself. It uses a char device and sysfs to interact with a userspace process to process interrupts and control memory accesses. See the docbook documentation for more details on how to use this interface. From: Hans J. Koch Cc: Thomas Gleixner Cc: Benedikt Spranger Signed-off-by: Greg Kroah-Hartman commit 967e35dcc9ac194b4a6fad69a5a51f93d69bb0d1 Author: Tejun Heo Date: Wed Jul 18 16:38:11 2007 +0900 sysfs: cosmetic clean up on node creation failure paths Node addition failure is detected by testing return value of sysfs_addfm_finish() which returns the number of added and removed nodes. As the function is called as the last step of addition right on top of error handling block, the if blocks looked like the following. if (sysfs_addrm_finish(&acxt)) success handling, usually return; /* fall through to error handling */ This is the opposite of usual convention in sysfs and makes the code difficult to understand. This patch inverts the test and makes those blocks look more like others. Signed-off-by: Tejun Heo Cc: Gabriel C Cc: Miles Lane Signed-off-by: Greg Kroah-Hartman commit a1da4dfe35bc36c3bc9716d995c85b7983c38a76 Author: Tejun Heo Date: Wed Jul 18 16:14:45 2007 +0900 sysfs: kill an extra put in sysfs_create_link() failure path There is a subtle bug in sysfs_create_link() failure path. When symlink creation fails because there's already a node with the same name, the target sysfs_dirent is put twice - once by failure path of sysfs_create_link() and once more when the symlink is released. Fix it by making only the symlink node responsible for putting target_sd. Signed-off-by: Tejun Heo Cc: Gabriel C Cc: Miles Lane Signed-off-by: Greg Kroah-Hartman commit 2ee97caf0a6602f749ddbfdb1449e383e1212707 Author: Cornelia Huck Date: Wed Jul 18 01:43:47 2007 -0700 Driver core: check return code of sysfs_create_link() Check for return value of sysfs_create_link() in device_add() and device_rename(). Add helper functions device_add_class_symlinks() and device_remove_class_symlinks() to make the code easier to read. [akpm@linux-foundation.org: fix unused var warnings] Signed-off-by: Cornelia Huck Acked-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit be3884943674f8ee7656b1d8b71c087ec900c836 Author: Paolo Ciarrocchi Date: Mon Jul 16 23:55:05 2007 +0200 HOWTO: Add the knwon_regression URI to the documentation We should let everybody know about where the regression list is hosted. The more is known the more it is used. Signed-off-by: Paolo Ciarrocchi Cc: Li Yang Cc: TripleX Chung Cc: Maggie Chen Cc: WANG Cong Cc: Tsugikazu Shibata Cc: IKEDA Munehiro Signed-off-by: Greg Kroah-Hartman commit 6b09448ab81e90e59c09cfbc6d0d612dc84a2b1d Author: David Brownell Date: Fri Jul 13 16:32:09 2007 -0700 dev_vdbg() documentation Update CodingStyle to talk about "-DDEBUG" message conventions and the new "-DVERBOSE_DEBUG" convention. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit aebdc3b450a3febf7d7d00cd2235509055ec7082 Author: David Brownell Date: Thu Jul 12 22:08:22 2007 -0700 dev_vdbg(), available with -DVERBOSE_DEBUG This defines a dev_vdbg() call, which is enabled with -DVERBOSE_DEBUG. When enabled, dev_vdbg() acts just like dev_dbg(). When disabled, it is a NOP ... just like dev_dbg() without -DDEBUG. The specific code was moved out of a USB patch, but lots of drivers have similar support. That is, code can now be written to use an additional level of debug output, selected at compile time. Many driver authors have found this idiom to be very useful. A typical usage model is for "normal" debug messages to focus on fault paths and not be very "chatty", so that those messages can be left on during normal operation without much of a performance or syslog load. On the other hand "verbose" messages would be noisy enough that they wouldn't normally be enabled; they might even affect timings enough to change system or driver behavior. Signed-off-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit bc37e2830339cbfa42ac8579a7bf62fc4cdd360d Author: Tejun Heo Date: Wed Jul 18 14:30:28 2007 +0900 sysfs: make sysfs_init_inode() static With sysfs_fill_super() converted to use sysfs_get_inode(), there is no user of sysfs_init_inode() outside of fs/sysfs/inode.c. Make it static. Signed-off-by: Tejun Heo Acked-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit e080e436f605877e47e4950f5386ed843badbb1b Author: Tejun Heo Date: Wed Jul 18 14:29:06 2007 +0900 sysfs: fix sysfs root inode nlink accounting While making sysfs indoes hashed, sysfs root inode was left out. Now that nlink accounting depends on the inode being on the hash, sysfs root inode nlink isn't adjusted properly. Put sysfs root inode on the inode hash by allocating it using sysfs_get_inode() like other sysfs inodes. While at it, massage comments a bit. Signed-off-by: Tejun Heo Acked-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 2c19c49a59ccf2162c0eb999de1ec60c0e07a533 Author: Brandon Philips Date: Tue Jul 17 22:09:34 2007 -0700 Documentation fix devres.txt: lib/iomap.c -> lib/devres.c Signed-off-by: Brandon Philips Acked-by: Tejun Heo Signed-off-by: Greg Kroah-Hartman commit 01da2425f327d7ac673e594bee5655523115970b Author: Akinobu Mita Date: Sat Jul 14 11:03:35 2007 +0900 sysfs: avoid kmem_cache_free(NULL) kmem_cache_free() with NULL is not allowed. But it may happen if out of memory error is triggered in sysfs_new_dirent(). This patch fixes that error handling. Signed-off-by: Akinobu Mita Signed-off-by: Greg Kroah-Hartman commit 3f8df781fc5f9ee5253a54ba669e1c8872844b86 Author: Alan Stern Date: Thu Jul 12 16:57:22 2007 -0400 PM: remove deprecated dpm_runtime_* routines This patch (as933) removes the deprecated dpm_runtime_suspend() and dpm_runtime_resume() routines from the PM core. The only user of those routines is the PCMCIA ds driver; local replacements are added. Signed-off-by: Alan Stern CC: Dominik Brodowski Signed-off-by: Greg Kroah-Hartman commit 471d0558045fe35f8c5f291c1ee63815eb9c2dcd Author: Alan Stern Date: Thu Jul 12 16:55:07 2007 -0400 PM: Remove deprecated sysfs files This patch (as932) removes the deprecated sysfs .../power/state attribute files. Signed-off-by: Alan Stern Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit 60a96a59569bab85571d0089682109bd3324e896 Author: Kay Sievers Date: Sun Jul 8 22:29:26 2007 +0200 Driver core: accept all valid action-strings in uevent-trigger This allows the uevent file to handle any type of uevent action to be triggered by userspace instead of just the "add" uevent. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit a6bb340da32f0abf76656be1619fb85150eef61b Author: Jens Axboe Date: Wed Jul 11 14:53:28 2007 +0200 debugfs: remove rmdir() non-empty complaint Hi, This patch kills the pointless debugfs rmdir() printk() when called on a non-empty directory. blktrace will sometimes have to call it a few times when forcefully ending a trace, which polutes the log with pointless warnings. Rationale: - It's more code to work-around this "problem" in the debugfs users, and you would have to add code to check for empty directories to do so (or assume that debugfs is using simple_ helpers, but that would be a layering violation). - Other rmdir() implementations don't complain about something this silly. Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman commit f9e29228e6f2058e7b086115ecb7008630ebd832 Author: Thomas Klein Date: Wed Jul 18 17:34:09 2007 +0200 eHEA: Fix bonding support The driver didn't allow an interface's MAC address to be modified if the respective interface wasn't setup - a failing Hcall was the result. Thus bonding wasn't usable. The fix moves the failing Hcall which was registering a MAC address for the reception of BC packets in firmware from the port up and down functions to the port resources setup functions. Additionally the missing update of the last_rx member of the netdev structure was added. Signed-off-by: Thomas Klein Signed-off-by: Jeff Garzik commit e190d6b140079c104ba57e5130a9b4ebea618e92 Author: Bryan Wu Date: Tue Jul 17 14:43:44 2007 +0800 Blackfin ethernet driver: on chip ethernet MAC controller driver This patch implements the driver necessary use the Analog Devices Blackfin processor's on-chip ethernet MAC controller. [try#2] - add timeout control - kill dma_config_reg bitfields - some trivial cleanup [try#3] - add endianess check - add DRV_NAME, DRV_VERSION... driver information string - add some comments for silicon anomaly and dma API confusion - some code trivial cleanup [try#4] - add Blackfin latest GPIO pin mux opertion with Michael Hennerich's help and Dan's review - rewrite the DMA descriptor list operation in a more readable way by Joe's review [try#5] - cleanup some coding style by Joe's review. [try#6] - 1.1 version fix a bug when set up multicast list pointed by Mr. yoshfuji - rearrange the desc_list_free function. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Cc: Michael Buesch Cc: Mike Frysinger Cc: Jeff Garzik Cc: Christoph Hellwig Cc: Dan Williams Cc: Joe Perches Cc: YOSHIFUJI Hideaki Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 308a90683da9a3e3da1023a88496f76f95c5dcd8 Author: Yoichi Yuasa Date: Wed Jul 18 11:13:42 2007 +0900 fix wrong argument of tc35815_read_plat_dev_addr() Fix wrong argument of tc35815_read_plat_dev_addr() Signed-off-by: Yoichi Yuasa Signed-off-by: Jeff Garzik commit 5e1751f8396544df3b334afd2e67557757d47fb0 Merge: dbf812d... 2534346... Author: Jeff Garzik Date: Wed Jul 18 18:31:03 2007 -0400 Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream commit dbf812d6ae6da1bfd01ea6abc5af60b358e4f9ba Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Tue Jul 17 13:45:43 2007 +0900 ARM/ETHER3: Handle multicast frames. Signed-off-by: YOSHIFUJI Hideaki -- Signed-off-by: Jeff Garzik commit 82a0244df8165b0345cde5258afe176c12dd1e99 Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Tue Jul 17 13:46:00 2007 +0900 SAA9730: Handle multicast frames. Signed-off-by: YOSHIFUJI Hideaki -- Signed-off-by: Jeff Garzik commit b947dd4b62a6adfd78292319a9d2e6396c1fb064 Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Tue Jul 17 13:45:50 2007 +0900 NI5010: Handle multicast frames. Signed-off-by: YOSHIFUJI Hideaki -- Signed-off-by: Jeff Garzik commit e78af36623b8eeead1c8590b43616eab159526fa Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Tue Jul 17 13:45:54 2007 +0900 NS83820: Handle multicast frames. Signed-off-by: YOSHIFUJI Hideaki -- Signed-off-by: Jeff Garzik commit 7132ab7f6e0309bb8e0424e395ba149aee0c750e Author: Andy Fleming Date: Wed Jul 11 11:43:07 2007 -0500 Fix RGMII-ID handling in gianfar The TSEC/eTSEC can detect the interface to the PHY automatically, but it isn't able to detect whether the RGMII connection needs internal delay. So we need to detect that change in the device tree, propagate it to the platform data, and then check it if we're in RGMII. This fixes a bug on the 8641D HPCN board where the Vitesse PHY doesn't use the delay for RGMII. Signed-off-by: Andy Fleming commit af2d940df2b60b15c271033d381c2f3ead655562 Author: Andy Fleming Date: Wed Jul 11 11:42:35 2007 -0500 Fix Vitesse RGMII-ID support The Vitesse PHY on the 8641D needs to be set up with internal delay to work in RGMII mode. So we add skew when it is set to RGMII_ID mode. Signed-off-by: Andy Fleming Signed-off-by: Haruki Dai Signed-off-by: Haiying Wang commit cc65185d400c4e8698ff1c1b59f90bd491e9bda5 Author: Andy Fleming Date: Tue Jul 10 17:28:49 2007 -0500 Add phy-connection-type to gianfar nodes The TSEC/eTSEC automatically detect their PHY interface type, unless the type is RGMII-ID (RGMII with internal delay). In that situation, it just detects RGMII. In order to fix this, we need to pass in rgmii-id if that is the connection type. Signed-off-by: Andy Fleming commit 1d5e83aac54b64b71b225fd5cf2e82491ad145f6 Author: Andy Fleming Date: Tue Jul 10 16:42:04 2007 -0500 Fix Vitesse 824x PHY interrupt acking The Vitesse 824x PHY doesn't allow an interrupt to be cleared if the mask bit for that interrupt isn't set. This means that the PHY Lib's order of handling interrupts (disable, then clear) breaks on this PHY. However, clearing then disabling the interrupt opens up the code for a silly race condition. So rather than change the PHY Lib, we change the Vitesse driver so it always clears interrupts before disabling them. Further, the ack function only clears the interrupt if interrupts are enabled. Signed-off-by: Andy Fleming Signed-off-by: York Sun Acked-by: Haiying Wang commit 9ee0be05dc69b61e5a869bffebd638b31898dae2 Author: Florin Malita Date: Wed Jul 18 18:04:46 2007 -0400 ISDN HiSax: uninitialized return in hisax_cs_setup Coverity (1792) spotted a possibly uninitialized return value in case of kmalloc() failure: 1116 static int hisax_cs_setup(int cardnr, struct IsdnCard *card, 1117 struct IsdnCardState *cs) 1119 int ret; 1120 1121 if (!(cs->rcvbuf = kmalloc(MAX_DFRAME_LEN_L1, GFP_ATOMIC))) { 1122 printk(KERN_WARNING "HiSax: No memory for isac rcvbuf\n"); 1123 ll_unload(cs); 1124 goto outf_cs; ... 1165 outf_cs: 1166 kfree(cs); 1167 card->cs = NULL; 1168 return ret; The straightforward solution would be to just add the missing initialization but hardcoding the return value in the out_cs branch (only taken on failure) seems to work just as well and it allows killing a couple of other lines too. Signed-off-by: Florin Malita Signed-off-by: Jeff Garzik commit 412edf654a04138805fcda2b46a842f681023eeb Author: Stefan Richter Date: Mon Jul 16 21:05:41 2007 +0200 firewire: fw-sbp2: convert to new SCSI data buffer accessors Signed-off-by: Stefan Richter commit 9c9bdf4d50730fd04b06077e22d7a83b585f26b5 Author: Stefan Richter Date: Tue Jul 17 02:15:36 2007 +0200 firewire: fix memory leak of fw_request instances Found and debugged by Jay Fenlason . The bug was especially noticeable with direct I/O over fw-sbp2. Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit 5d59a6f1ba90f15132d55d9d4d5a632f15a43d84 Author: Stefan Richter Date: Tue Jul 17 02:13:48 2007 +0200 firewire: remove bogus check in fw_core_handle_request This check is bogus: - Maximum asynchronous payload size for S800...S3200 is 4096. - The p->payload_length is totally uninteresting. Only the request->length of the subsequently allocated and initialized struct fw_request is of significance. Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit b980f5a224f3df6c884dbf5ae48797ce352ba139 Author: Stefan Richter Date: Thu Jul 12 22:25:14 2007 +0200 firewire: fw-ohci: fix "scheduling while atomic" context_stop is called by bus_reset_tasklet, among else. Signed-off-by: Stefan Richter commit 362e901c65123e0e72a764fcbe6c3d6a2505c7a6 Author: Stefan Richter Date: Thu Jul 12 22:24:19 2007 +0200 firewire: fw-ohci: flush MMIO write before msleep Signed-off-by: Stefan Richter commit 43509d1fece975ac457282ca1137fe438894a81d Author: Roland Dreier Date: Wed Jul 18 13:28:29 2007 -0700 IB/mthca: Simplify use of size0 in work request posting Current code sets size0 to 0 at the start of work request posting functions and then handles size0 == 0 specially within the loop over work requests. Change this so size0 is set along with f0 the first time through the loop (when nreq == 0). This makes the code easier to understand by making it clearer that f0 and size0 are always initialized if nreq != 0 without having to know that size0 == 0 implies nreq == 0. Also annotate size0 with uninitialized_var() so that this doesn't introduce a new compiler warning. Signed-off-by: Roland Dreier commit e535c699bfeafd0380418156f93494e370613e9d Author: Roland Dreier Date: Wed Jul 18 13:21:14 2007 -0700 IB/mthca: Factor out setting WQE UD segment entries Factor code to set UD entries out of the work request posting functions into inline functions set_tavor_ud_seg() and set_arbel_ud_seg(). This doesn't change the generated code in any significant way, and makes the source easier on the eyes. Signed-off-by: Roland Dreier commit 5bae7ac9feba925fd0099057f6b23d7be80b7b41 Merge: 97405fe... 587ca76... Author: Linus Torvalds Date: Wed Jul 18 12:57:52 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: [AVR32] Initialize phy_mask for both macb devices [AVR32] Fix atomic_add_unless() and atomic_sub_unless() [AVR32] Correct misspelled CONFIG_BLK_DEV_INITRD variable. [AVR32] Fix build error in parse_tag_rdimg() [AVR32] Don't wire up macb0 unless SW6 is in default position [AVR32] Wire up SSC platform device 0 as TX on ATSTK1000 board [AVR32] Add Atmel SSC driver platform device to AT32AP architecture [AVR32] Remove optimization of unaligned word loads [AVR32] Make STK1000 mux settings configurable [AVR32] CPU frequency scaling for AT32AP [AVR32] Split SM device into PM, RTC, WDT and EIC [AVR32] faster avr32 unaligned access commit 400ddc11eb01a8d04c580892fde3adbd45ebdc9e Author: Roland Dreier Date: Wed Jul 18 12:55:42 2007 -0700 IB/mthca: Factor out setting WQE remote address and atomic segment entries Factor code to set remote address and atomic segment entries out of the work request posting functions into inline functions set_raddr_seg() and set_atomic_seg(). This doesn't change the generated code in any significant way, and makes the source easier on the eyes. Signed-off-by: Roland Dreier commit 97405fe26b2a4df7090884b086ee8224ace2a6d1 Merge: a10d9a7... 3fbc541... Author: Linus Torvalds Date: Wed Jul 18 12:13:02 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup: [PATCH] x86: do not recompile boot for each build [x86 setup] Save/restore DS around invocations of INT 10h [x86 setup] VGA: Clear the Protect bit before setting the vertical height [x86 setup] Fix assembly constraints [x86 setup] build/tools.c: fix comment [x86 setup] MAINTAINERS: document x86 setup code git tree commit a10d9a71bafd3a283da240d2868e71346d2aef6f Author: Peter Zijlstra Date: Wed Jul 18 20:59:22 2007 +0200 i386: fixup TRACE_IRQ breakage The TRACE_IRQS_ON function in iret_exc: calls a C function without ensuring that the segments are set properly. Move the trace function and the enabling of interrupt into the C stub. Signed-off-by: Peter Zijlstra Signed-off-by: Linus Torvalds commit 29eb51101c02df517ca64ec472d7501127ad1da8 Author: Roland McGrath Date: Mon Jul 16 01:03:16 2007 -0700 Handle bogus %cs selector in single-step instruction decoding The code for LDT segment selectors was not robust in the face of a bogus selector set in %cs via ptrace before the single-step was done. Signed-off-by: Roland McGrath Signed-off-by: Linus Torvalds commit 0fbfa6a9062c71b62ec216c0294b676b76e41661 Author: Roland Dreier Date: Wed Jul 18 11:47:55 2007 -0700 IB/mlx4: Factor out setting other WQE segments Factor code to set remote address, atomic and datagram segments out of mlx4_ib_post_send() into small helper functions. This doesn't change the generated code in any significant way, and makes the source easier on the eyes. Signed-off-by: Roland Dreier commit 587ca7619a150cef0ce0dd8fd08c367e502f0421 Author: Haavard Skinnemoen Date: Wed Jul 18 20:32:49 2007 +0200 [AVR32] Initialize phy_mask for both macb devices The STK1000 uses pullups on the MDIO lines to the PHY, but they are too weak. This causes the PHY layer to detect PHYs on all possible MII addresses. Mask out all but the correct address to prevent this from happening. Signed-off-by: Haavard Skinnemoen commit 3da86ee4f1884c70edbf76f61bfbbe028d2d1685 Author: Haavard Skinnemoen Date: Wed Jul 18 20:06:04 2007 +0200 [AVR32] Fix atomic_add_unless() and atomic_sub_unless() These functions depend on "result" being initalized to 0, but "result" is not included as an input constraint to the inline assembly block following its initialization, only as an output constraint. Thus gcc thinks it doesn't need to initialize it, so result ends up undefined if the "unless" condition is true. This fixes an oops in sunrpc where the faulty atomics caused rpciod_up() to not start the workqueue as it should. Signed-off-by: Haavard Skinnemoen commit f3e26984f1794f3472a50f330c5561766faa477b Author: Robert P. J. Day Date: Thu Jul 12 18:31:08 2007 -0400 [AVR32] Correct misspelled CONFIG_BLK_DEV_INITRD variable. Signed-off-by: Robert P. J. Day Signed-off-by: Haavard Skinnemoen commit aa15f63790cfd4110ff57c37aa1c6c34133d8a09 Author: Haavard Skinnemoen Date: Fri Jul 13 11:26:01 2007 +0200 [AVR32] Fix build error in parse_tag_rdimg() This code is inside an #ifdef with a misspelled config symbol, so it hasn't been used for a long time. Fix it before fixing the config symbol to keep bisection working. Signed-off-by: Haavard Skinnemoen commit d420d9e32f4bd741b2f0b7227a91941107f96b47 Author: Roland Dreier Date: Wed Jul 18 11:46:27 2007 -0700 IB/mlx4: Factor out setting WQE data segment entries Factor code to set data segment entries out of mlx4_ib_post_send() into set_data_seg(). This cleans up the code and lets the compiler do a better job -- on x86_64: add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-16 (-16) function old new delta mlx4_ib_post_send 1598 1582 -16 Signed-off-by: Roland Dreier commit d4003ba0a11f9fb484bd45fd83b75f7108871ef2 Author: Kristoffer Nyborg Gregertsen Date: Fri Jul 6 14:37:30 2007 +0200 [AVR32] Don't wire up macb0 unless SW6 is in default position If the user wants to sacrifice macb0 for more GPIOs, let him. Signed-off-by: Haavard Skinnemoen commit 95a42267cd933a95275c1d6835010d662259f74e Author: Hans-Christian Egtvedt Date: Fri Jul 6 14:34:03 2007 +0200 [AVR32] Wire up SSC platform device 0 as TX on ATSTK1000 board Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Haavard Skinnemoen commit 9cf6cf58d06527fc5bc8e2965ddccdeca59ccee3 Author: Hans-Christian Egtvedt Date: Fri Jul 6 14:31:55 2007 +0200 [AVR32] Add Atmel SSC driver platform device to AT32AP architecture This patch adds register definitions, clocks and IRQs to the platform devices. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Haavard Skinnemoen commit e122eaf69422e5d9ce93fc9786099098e3b9e1c4 Author: Haavard Skinnemoen Date: Wed Jun 20 15:29:15 2007 +0200 [AVR32] Remove optimization of unaligned word loads If we let unaligned word loads bypass the generic unaligned handling, gcc may combine it with a swap.b instruction and turn it into a ldwsp instruction, which does not work with unaligned addresses. Revert the optimization to prevent the RNDIS driver from crashing. Hopefully we'll figure something out later (it may be better to do the optimization in gcc.) Signed-off-by: Haavard Skinnemoen commit a8e93ed8cb3d9aa22d192033009357526548c825 Author: David Brownell Date: Tue Jun 12 14:34:47 2007 +0200 [AVR32] Make STK1000 mux settings configurable This adds some STK1002-specific config options covering the jumper settings, so the kernel can automatically be configured to include the relevant devices. One of them replaces the previous internal SW2_DEFAULT setting; SPI config is affected by two of the jumpers; and a fourth one switches between LCD and the second Ethernet connector. (There's more that to be done.) Signed-off-by: David Brownell Signed-off-by: Haavard Skinnemoen commit 9e58e1855c9815ad4944df90f695a7645c50f463 Author: Hans-Christian Egtvedt Date: Mon Jun 4 16:10:57 2007 +0200 [AVR32] CPU frequency scaling for AT32AP This patch enables CPU frequency scaling for AT32AP devices. This will enable the CPU to scale between the speed of the high speed bus and the master clock and thus save some power. The patch also adds a parent to cpu_clk and a cpu_clk_set_rate to enable changing the CPU clock divider in a sane way. The driver does not check if the given rate is 0, thus resulting in a div by 0. I think this check should be go into the clk_set_rate framework, and not here. Tested on AT32AP7000/ATSTK1000. Hardware documentation can be found in the AT32AP7000 datasheet. Signed-off-by: Hans-Christian Egtvedt Signed-off-by: Haavard Skinnemoen commit 7a5b80590772c29bba1d54d3685622177d6fe39f Author: Haavard Skinnemoen Date: Mon Jun 4 12:58:30 2007 +0200 [AVR32] Split SM device into PM, RTC, WDT and EIC Split the SM platform device into separate platform devices for PM, RTC, WDT and EIC. This is more correct according to the documentation and allows us to simplify the code a little. Also turn the EIC driver into a real platform driver. Signed-off-by: Haavard Skinnemoen Acked-by: Hans-Christian Egtvedt commit c6083cd61b5a64a1c73d1634744382f54cb99595 Author: David Brownell Date: Fri May 25 18:47:47 2007 -0700 [AVR32] faster avr32 unaligned access Use a more conventional implementation for unaligned access, and include an AT32AP-specific optimization: the CPU will handle unaligned words. The result is always faster and smaller for 8, 16, and 32 bit values. For 64 bit quantities, it's presumably larger. Signed-off-by: David Brownell Signed-off-by: Haavard Skinnemoen commit 3fbc54165d7217abf62b871c0dd074e76ce0eb31 Author: Sam Ravnborg Date: Tue Jul 17 22:27:22 2007 +0200 [PATCH] x86: do not recompile boot for each build Keep the arch/i386/boot directory from being rebuilt every time. Signed-off-by: Sam Ravnborg Signed-off-by: H. Peter Anvin commit 8c027ae2dcfa7b9130941a2a743c735c1fee04ee Author: H. Peter Anvin Date: Mon Jul 16 11:58:24 2007 -0700 [x86 setup] Save/restore DS around invocations of INT 10h There exists at least one card, Trident TVGA8900CL (BIOS dated 1992/9/8) which clobbers DS when "scrolling in an SVGA text mode of more than 800x600 pixels." Although we are extremely unlikely to run into that situation, it is cheap insurance to save and restore DS, and it only adds a grand total of 50 bytes to the total output. Pointed out by Etienne Lorrain. Cc: Etienne Lorrain Signed-off-by: H. Peter Anvin commit 7ad37df02c529525c4ad19035359af89d2d2a5bd Author: H. Peter Anvin Date: Tue Jul 17 16:16:10 2007 -0700 [x86 setup] VGA: Clear the Protect bit before setting the vertical height If the user has asked for the vertical height registers to be recomputed by setting bit 15 in the video mode number, we do so without clearing the Protect bit in the Vertical Retrace Register before setting the Overflow register. As a result, if the VGA BIOS had set the Protect bit, the write to the Overflow register will be dropped, and bits [9:8] of the vertical height will be left unchanged. This is a bug imported from the assembly version of this code. It was pointed out by Etienne Lorrain. Cc: Etienne Lorrain Signed-off-by: H. Peter Anvin commit 5593eaa854d0b23c3b270933a93b9b82946df729 Author: H. Peter Anvin Date: Sat Jul 14 16:47:13 2007 -0700 [x86 setup] Fix assembly constraints Fix incorrect assembly constraints. In particular, fix memory constraints used inside push..pop, which can cause invalid operation since gcc may generate %esp-relative references. Additionally: outl() should have "dN" not "dn". query_mca() shouldn't listen 16/32-bit registers in an 8-bit only context. has_eflag(): the "mask" is only used well after both the stack pointer and the output registers have been touched; this requires the output registers to be earlyclobbers (=&) and the input to exclude memory (so "ri", not "g"). Thanks to Etienne Lorrain and Chuck Ebbert for prompting this review. Cc: Etienne Lorrain Cc: Chuck Ebbert Signed-off-by: H. Peter Anvin commit 9aa3909c0ea33da41755e15182fa4f88ae036d83 Author: H. Peter Anvin Date: Fri Jul 13 16:28:27 2007 -0700 [x86 setup] build/tools.c: fix comment Correct a comment in arch/i386/boot/build/tools.c; we now build the kernel from only two components instead of three, since the boot sector has been integrated in the setup code. Signed-off-by: H. Peter Anvin commit 72af61c6ae6ce6e6b3935a11073b193508cb3b39 Author: H. Peter Anvin Date: Fri Jul 13 16:26:55 2007 -0700 [x86 setup] MAINTAINERS: document x86 setup code git tree Document the existence of a published git tree for the x86 setup code. Signed-off-by: H. Peter Anvin commit 80885456e844552044c8c5f1f9bf0f6773b187ea Author: Roland Dreier Date: Wed Jul 18 11:30:34 2007 -0700 IB/mthca: Factor out setting WQE data segment entries Factor code to set data segment entries out of the work request posting functions into inline functions mthca_set_data_seg() and mthca_set_data_seg_inval(). This makes the code more readable and also allows the compiler to do a better job -- on x86_64: add/remove: 0/0 grow/shrink: 0/6 up/down: 0/-69 (-69) function old new delta mthca_arbel_post_srq_recv 373 369 -4 mthca_arbel_post_receive 570 562 -8 mthca_tavor_post_srq_recv 520 508 -12 mthca_tavor_post_send 1344 1330 -14 mthca_arbel_post_send 1481 1467 -14 mthca_tavor_post_receive 792 775 -17 Signed-off-by: Roland Dreier commit a267c0a887064720dfab5775a4f09b20b4f8ec37 Merge: d756d10... 97989ad... Author: Linus Torvalds Date: Wed Jul 18 11:25:58 2007 -0700 Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (126 commits) V4L/DVB (5847): Clean up schedule_timeout calls in cpia2 and ivtv code V4L/DVB (5846): Clean up setting state and scheduling timeouts V4L/DVB (5844): ivtv: add high volume debugging flag V4L/DVB (5843): ivtv: fix missing signal_pending check. V4L/DVB (5842): ivtv: Add locking to ensure stream setup is atomic. V4L/DVB (5841): tveeprom: add support for Philips FQ1216LME MK3 tuner. V4L/DVB (5840): fix dst and cx24123: tune() callback changed signess for delay V4L/DVB (5838): dvb-core: Fix signedness warnings (gcc 4.1.1, kernel 2.6.22) V4L/DVB (5837): stv0299: Fix signedness warning (gcc 4.1.1, kernel 2.6.22) V4L/DVB (5836): dvb-ttpci: re-initialize aspect ratio and pan scan after arm crash V4L/DVB (5835): saa7146/dvb-ttpci: Fix signedness warnings (gcc 4.1.1, kernel 2.6.22) V4L/DVB (5834): dvb-core: fix signedness warnings and const stripping V4L/DVB (5832): ir-common: optimize bit extract function V4L/DVB (5831): stradis: use ARRAY_SIZE V4L/DVB (5829): Firmware extract and loading for opera dvb-usb update V4L/DVB (5828): Kconfig: Added GemTek USB radio and removed experimental dependency. V4L/DVB (5826): Usbvision: video mux cleanup V4L/DVB (5825): Alter the tuner type for the WinTV USB UK PAL model. V4L/DVB (5824): Usbvision: Hauppauge WinTV USB SECAM_L fix V4L/DVB (5821): Saa7134: add remote control support for LifeView FlyDVB-S LR300 ... commit d756d10e246a01515d07f8161181b8a14afba7cc Merge: cdf4a64... e9f410b... Author: Linus Torvalds Date: Wed Jul 18 10:32:00 2007 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: extent macros cleanup Fix compilation with EXT_DEBUG, also fix leXX_to_cpu conversions. ext4: remove extra IS_RDONLY() check ext4: Use is_power_of_2() Use zero_user_page() in ext4 where possible ext4: Remove 65000 subdirectory limit ext4: Expand extra_inodes space per the s_{want,min}_extra_isize fields ext4: Add nanosecond timestamps jbd2: Move jbd2-debug file to debugfs jbd2: Fix CONFIG_JBD_DEBUG ifdef to be CONFIG_JBD2_DEBUG ext4: Set the journal JBD2_FEATURE_INCOMPAT_64BIT on large devices ext4: Make extents code sanely handle on-disk corruption ext4: copy i_flags to inode flags on write ext4: Enable extents by default Change on-disk format to support 2^15 uninitialized extents write support for preallocated blocks fallocate support in ext4 sys_fallocate() implementation on i386, x86_64 and powerpc commit cdf4a6482dd4c739f8c1132c5a9356912911fec5 Merge: 485cf92... add0b43... Author: Linus Torvalds Date: Wed Jul 18 10:27:24 2007 -0700 Merge branch 'upstream' of git://git.infradead.org/~dedekind/ubi-2.6 * 'upstream' of git://git.infradead.org/~dedekind/ubi-2.6: (28 commits) UBI: fix compile warning UBI: fix error handling in erase worker UBI: fix comments UBI: remove unneeded error checks UBI: cleanup usage of try_module_get UBI: fix overflow bug UBI: bugfix in max_sqnum calculation UBI: bugfix in sqnum calculation UBI: fix signed-unsigned multiplication UBI: fix bug in atomic_leb_change() UBI: fix message UBI: fix debugging stuff UBI: bugfix in error path UBI: use is_power_of_2() UBI: fix freeing ubi->vtbl while unloading UBI: fix MAINTAINERS UBI: bugfix in ubi_leb_change() UBI: kill homegrown endian macros UBI: cleanup ioctl handling UBI: error path bugfix ... commit 97989ada7628da262eafb4bebce0a319c7cb0f5f Author: Robert P. J. Day Date: Mon Jul 16 10:47:51 2007 -0300 V4L/DVB (5847): Clean up schedule_timeout calls in cpia2 and ivtv code Signed-off-by: Robert P. J. Day Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f3a43d3082cd9c2308612e0331ad3b1b9d3a7a33 Author: Robert P. J. Day Date: Mon Jul 16 10:46:42 2007 -0300 V4L/DVB (5846): Clean up setting state and scheduling timeouts Replace assignments to "current->state" with the preferred calls to schedule_timeout_interruptible(). Signed-off-by: Robert P. J. Day Signed-off-by: Mauro Carvalho Chehab commit bd58df6d522d5a9c791f6a4820e480e9be60650d Author: Hans Verkuil Date: Tue Jul 10 17:47:07 2007 -0300 V4L/DVB (5844): ivtv: add high volume debugging flag Add support for high volume debug messages, allowing them to be turned on selectively. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 90851fe9fad68db24da8cb497bad7327b97ed3d2 Author: Hans Verkuil Date: Tue Jul 10 15:08:33 2007 -0300 V4L/DVB (5843): ivtv: fix missing signal_pending check. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f885969196da6ae905162c0d1c5f0553de12cb40 Author: Hans Verkuil Date: Tue Jul 10 14:58:33 2007 -0300 V4L/DVB (5842): ivtv: Add locking to ensure stream setup is atomic. Starting an MPEG and VBI capture simultaneously caused errors in the VBI setup: this setup was done twice when it should be done only for the first stream that is opened. Added a mutex to prevent this from happening. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0901973f4bde9c1004795c9c2321bdc51f3996f1 Author: Hans Verkuil Date: Tue Jul 10 14:51:33 2007 -0300 V4L/DVB (5841): tveeprom: add support for Philips FQ1216LME MK3 tuner. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3ea96615381157fc7b94549db559adabd7d4233f Author: Mauro Carvalho Chehab Date: Mon Jul 16 09:27:20 2007 -0300 V4L/DVB (5840): fix dst and cx24123: tune() callback changed signess for delay tune() dvb_frontend callback changed delay signess: int (*tune)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, unsigned int mode_flags, - int *delay, + unsigned int *delay, This change caused warnings on cx24123 and dst modules: /home/v4l/master/v4l/cx24123.c:1034: warning: initialization from incompatible pointer type /home/v4l/master/v4l/dst.c:1782: warning: initialization from incompatible pointer type /home/v4l/master/v4l/dst.c:1808: warning: initialization from incompatible pointer type /home/v4l/master/v4l/dst.c:1837: warning: initialization from incompatible pointer type /home/v4l/master/v4l/dst.c:1860: warning: initialization from incompatible pointer type This patch corrects the function prototype on both modules to follow the core change. Signed-off-by: Mauro Carvalho Chehab commit 260f8d7c4cda79b087a182eb03e8574ba41a171e Author: Oliver Endriss Date: Fri Jul 13 11:54:35 2007 -0300 V4L/DVB (5838): dvb-core: Fix signedness warnings (gcc 4.1.1, kernel 2.6.22) Fix signedness warnings (gcc 4.1.1, kernel 2.6.22). Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 0402a6c2aadbd5ff0e70a67f80a4907bf76792c6 Author: Oliver Endriss Date: Thu Jul 12 23:22:59 2007 -0300 V4L/DVB (5837): stv0299: Fix signedness warning (gcc 4.1.1, kernel 2.6.22) Fix signedness warning (gcc 4.1.1, kernel 2.6.22). Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit defd574ec07edaa1587da144d03b18495ab484b1 Author: Oliver Endriss Date: Thu Jul 12 23:08:07 2007 -0300 V4L/DVB (5836): dvb-ttpci: re-initialize aspect ratio and pan scan after arm crash Re-initialize aspect ratio and pan scan after arm crash. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 804b4458943f14bf144d3c3ba50097ced9b27b29 Author: Oliver Endriss Date: Thu Jul 12 20:37:50 2007 -0300 V4L/DVB (5835): saa7146/dvb-ttpci: Fix signedness warnings (gcc 4.1.1, kernel 2.6.22) Fix signedness warnings (gcc 4.1.1, kernel 2.6.22). Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 372280d2a3593e90d8849a5dc5676d2e9799e3a3 Author: Trent Piepho Date: Fri Jul 13 18:46:19 2007 -0300 V4L/DVB (5834): dvb-core: fix signedness warnings and const stripping Make some pointers const, and then delete some now unnecessary casts, which were the wrong signedness anyway, being used to strip the const from another pointer. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit d67be61ebe5efaf9c4c11bf168781d678854c966 Author: Trent Piepho Date: Wed Jul 11 20:28:44 2007 -0300 V4L/DVB (5832): ir-common: optimize bit extract function New code is simpler, shorter, compiles to about half the size, and is 2 to 4 times faster depending on how many bits in the mask are set. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit ba2cf98249795f03792d1409a3b6aaa589ea0745 Author: Trent Piepho Date: Thu Jul 5 19:04:27 2007 -0300 V4L/DVB (5831): stradis: use ARRAY_SIZE sizeof(palette2fmt) / sizeof(u32) => ARRAY_SIZE(palette2fmt) Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 59800555f79a52394c3c29e19e448b4635daf14c Author: Marco Gittler Date: Wed Jul 4 19:18:34 2007 -0300 V4L/DVB (5829): Firmware extract and loading for opera dvb-usb update Better way of creating and loading the firmware used. Update for get_dvb_firmware script to extract the files for opera usb-box Help file for creating the firmware added Signed-off-by: Marco Gittler Signed-off-by: Mauro Carvalho Chehab commit b31c33bd8b339e426138dd267ec969291f802a0d Author: Douglas Schilling Landgraf Date: Mon Jul 2 23:16:17 2007 -0300 V4L/DVB (5828): Kconfig: Added GemTek USB radio and removed experimental dependency. Added GemTek USB radio and removed experimental dependency. Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 66a17879e9f18a38c4ca5e6ba600a3f5b1b51188 Author: Thierry MERLE Date: Tue Jun 26 16:35:30 2007 -0300 V4L/DVB (5826): Usbvision: video mux cleanup - usbvision_muxsel simplified, now uses some well known constants. - since the decoder needs to change input norm, call to muxsel added when changing video standard. Signed-off-by: Thierry MERLE Acked-by: Dwaine Garden Signed-off-by: Mauro Carvalho Chehab commit ffddcaa6ec4e85ed8504deac1f51f44c86ec1d23 Author: Matthew Garrett Date: Sat Jun 30 15:41:27 2007 -0300 V4L/DVB (5825): Alter the tuner type for the WinTV USB UK PAL model. Alter the tuner type for the WinTV USB UK PAL model. Signed-off-by: Matthew Garrett Signed-off-by: Thierry MERLE Signed-off-by: Mauro Carvalho Chehab commit 485cf925d8b7a6b3c62fe5f1e167f2d0d4edf32a Merge: 31bdc5d... 3fd8f9e... Author: Linus Torvalds Date: Wed Jul 18 10:24:36 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits) [NETFILTER]: xt_connlimit needs to depend on nf_conntrack [NETFILTER]: ipt_iprange.h must #include [IrDA]: Fix IrDA build failure [ATM]: nicstar needs virt_to_bus [NET]: move __dev_addr_discard adjacent to dev_addr_discard for readability [NET]: merge dev_unicast_discard and dev_mc_discard into one [NET]: move dev_mc_discard from dev_mcast.c to dev.c [NETLINK]: negative groups in netlink_setsockopt [PPPOL2TP]: Reset meta-data in xmit function [PPPOL2TP]: Fix use-after-free [PKT_SCHED]: Some typo fixes in net/sched/Kconfig [XFRM]: Fix crash introduced by struct dst_entry reordering [TCP]: remove unused argument to cong_avoid op [ATM]: [idt77252] Rename CONFIG_ATM_IDT77252_SEND_IDLE to not resemble a Kconfig variable [ATM]: [drivers] ioremap balanced with iounmap [ATM]: [lanai] sram_test_word() must be __devinit [ATM]: [nicstar] Replace C code with call to ARRAY_SIZE() macro. [ATM]: Eliminate dead config variable CONFIG_BR2684_FAST_TRANS. [ATM]: Replacing kmalloc/memset combination with kzalloc. [NET]: gen_estimator deadlock fix ... commit a1bad7773e562f331b5951def24f73c38579e0cb Author: Thierry MERLE Date: Tue Jun 26 16:35:30 2007 -0300 V4L/DVB (5824): Usbvision: Hauppauge WinTV USB SECAM_L fix - Hauppauge WinTV USB SECAM_L fixed (needed some picture X and Y shiftings) Signed-off-by: Thierry MERLE Signed-off-by: Mauro Carvalho Chehab commit f5c965abdf44ee6983712e54bbbcc7905af56d39 Author: James Le Cuirot Date: Mon Jul 2 12:53:25 2007 -0300 V4L/DVB (5821): Saa7134: add remote control support for LifeView FlyDVB-S LR300 It has been confirmed that the FlyDVB IR codes currently in the kernel work with the LifeView FlyDVB-S LR300. This one line addition adds it to the list of supported cards. Signed-off-by: James Le Cuirot Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9b7cc42917ed07ab75269d35cd7709a5fd6336e0 Author: Mauro Carvalho Chehab Date: Mon Jul 2 15:48:40 2007 -0300 V4L/DVB (5820): Cleanup on cinergyT2: Remove unneeded if(1) Before kernel 2.6.14, the driver checked for status before stopping the thread. So, a compatibility test did exist. After 2.6.14, the if (state) were replaced by: if (1) However, it makes no sense to keep the if(1). Signed-off-by: Mauro Carvalho Chehab commit 18f3fa1e2eab297a2f7ec704385fa0ecfda0de55 Author: Mauro Carvalho Chehab Date: Mon Jul 2 15:39:57 2007 -0300 V4L/DVB (5819): Cleanup: reorder some includes Some includes were added after some non-include macros, on old drivers. Better to keep all includes at the beginning of the files. This change also helps to make backports to properly work at the development tree. Signed-off-by: Mauro Carvalho Chehab commit 7e520d09f1a4b3da1d09a4540e3f4fa852658a0d Author: Jean Delvare Date: Sun Jul 1 18:37:51 2007 -0300 V4L/DVB (5815): Cx88: i2c structure templates clean-up Clean up the use of structure templates in cx88-i2c and cx88-vp3054-i2c. For one thing, a real template is supposed to be read-only. And in some cases it's more efficient to initialize the few fields we need individually. This clean-up shrinks cx88-i2c.o by 33% and cx88-vp3054-i2c.o by 49% (x86_64). Signed-off-by: Jean Delvare Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 4de7bb44cc6aa6e0a74f80c628f600da5b8fcd47 Author: Adrian Bunk Date: Sun Jul 1 18:24:33 2007 -0300 V4L/DVB (5814): Unexport dvb_pll_configure Now that it's static, it should no longer be exported to modules... Signed-off-by: Adrian Bunk Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8fb2191a74a0e2a29002c06084e015d33d2ecdda Author: Adrian Bunk Date: Sun Jul 1 18:22:00 2007 -0300 V4L/DVB (5813): TUNER_TEA5761 kconfig fixes The following doesn't make much sense: drivers/media/video/Kconfig: ... config TUNER_TEA5761 tristate "TEA 5761 radio tuner (EXPERIMENTAL)" ... drivers/media/video/Makefile: ... ifneq ($(CONFIG_TUNER_TEA5761),) tuner-objs += tea5761.o endif ... With this setup, TUNER_TEA5761=m is equivalent to TUNER_TEA5761=y. This patch therefore changes TUNER_TEA5761 to a bool. The missing dependency on EXPERIMENTAL the prompt text indicates also gets added by this patch. Additionally, the Makefile entry can now be written in a more compact way. Signed-off-by: Adrian Bunk Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 51b540292a349b380ccc0572401c6ac343acdf4a Author: Matthias Kaehlcke Date: Mon Jul 2 10:19:38 2007 -0300 V4L/DVB (5811): Use mutex instead of semaphore in Virtual Video driver The Virtual Video driver uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke Signed-off-by: Mauro Carvalho Chehab commit b9378fdbc334d1575b492108eac822a78c0c46d9 Author: Matthias Kaehlcke Date: Mon Jul 2 10:04:52 2007 -0300 V4L/DVB (5809): Use mutex instead of semaphore in Philips webcam driver The Philips webcam driver uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. -- Signed-off-by: Matthias Kaehlcke Signed-off-by: Mauro Carvalho Chehab commit 55c0d1005a0e5f590f71f918e49bdc81362f93a6 Author: Trent Piepho Date: Fri Jun 29 00:17:36 2007 -0300 V4L/DVB (5807): Bttv: Add support for DBG_[SG]_REGISTER ioctls Adds the advanced debugging register read/write ioctl support to the bttv driver. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 8c2c0dfe4da28a152c0de2c2ca3a66c1bc2fef7c Author: Trent Piepho Date: Thu Jun 28 18:30:36 2007 -0300 V4L/DVB (5806): Bttv: Be consistent in using symbolic names instead of constants For svhs, tuner, and tuner_type, be consistent in using UNSET instead of -1. For tuner_type also consistently use the existing constants: 0 => TUNER_TEMIC_PAL 1 => TUNER_PHILIPS_PAL_I 2 => TUNER_PHILIPS_NTSC 4 => TUNER_ABSENT 5 => TUNER_PHILIPS_PAL 21 => TUNER_TEMIC_4039FR5_NTSC 25 => TUNER_LG_PAL_I_FM Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit ac7dc84584310a836d13236767d71545f5b695b3 Author: Trent Piepho Date: Thu Jun 28 17:51:08 2007 -0300 V4L/DVB (5805): Bttv: Fix problems with probing for non-existent tuners The bttv driver has code to detect if a tda9887 is present, that was previous used to auto-load the tda9887 driver. Now there is no tda9887 driver, so the code is pointless; it just figures out if it should load the driver and then does nothing. For cards that are defined as having no tuner, the init code would still do i2c probes for various tuner devices and auto-load the tuner module. That can be skipped for cards that don't need it. The code is made to understand that in addition to 'UNSET', 'TUNER_ABSENT' also means no tuner. The tuner into printk()s are also made nicer. Levels are added, INFO or WARNING, depending on the meaning. For cards with no tuner, or no tuner defined, a more informative message is printed. Card has no tuner, before patch: bttv0: tuner type=-1 or bttv0: tuner type=4 After patch: bttv0: tuner absent Card has a tuner, but the type isn't defined, before patch: bttv0: tuner type=-1 After patch: bttv0: tuner type unset [<- also warning now, as the tuner won't work right] Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 27cb786f4ec5fe85e9e2deffa4d33eed2f588cb0 Author: Michael Krufky Date: Thu Jun 28 12:19:20 2007 -0300 V4L/DVB (5803): Bttv: add support for DViCO FusionHDTV 2 add analog video support for DViCO FusionHDTV 2 Thanks to Todd Ignasiak for donating the card. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c350f617ff5440dedea63b9d7826644742ec215d Author: Michael Krufky Date: Wed Jun 27 16:26:32 2007 -0300 V4L/DVB (5801): Tuner: update FCV1236D ranges to match the datasheet Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit b82736362b24046d6d2279260ce0b88653dc43da Author: Michael Krufky Date: Wed Jun 27 14:38:45 2007 -0300 V4L/DVB (5800): Tuner: correct description of Philips FCV1236D tuner The old description was "Philips 1236D ATSC/NTSC dual in", which can be confused with other Philips tuner models. This patch corrects the name to "Philips FCV1236D ATSC/NTSC dual in", and updates the range and params array names to match the description. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit cd2cd0aad0c8d5d29492335307b371f247b7a60f Author: Michael Krufky Date: Sun Jun 24 18:14:52 2007 -0300 V4L/DVB (5799): Or51211: remove hardcoded fcv1236d tuner programming - Remove hardcoded fcv1236d tuner programmming from or51211.c - Alter dvb-bt8xx for the pcHDTV-2000 to use dvb-pll for fcv1236d support. Thanks to Jarom Hatch for testing this change. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f1b24397e86c4c5b6984e2e67c17a53cdab14b35 Author: Michael Krufky Date: Fri Oct 13 22:18:01 2006 -0300 V4L/DVB (5798): Dvb-pll: add support for Philips fcv1236d This patch adds support to the dvb-pll library for the Philips fcv1236d tuner, based on the FCV1236D datasheet. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit d06cdbe59068a143ff2de2474fea62923cb7026f Author: Marco Gittler Date: Thu Jun 28 10:10:00 2007 -0300 V4L/DVB (5795): Fix: remove unused struct that could avoiding load the firmware The dvb_usb_device* d is not used anymore and can be removed. Signed-off-by: Marco Gittler Signed-off-by: Mauro Carvalho Chehab commit 8218b0b2caecf4af55742e12e9986c15605bb197 Author: Michael Krufky Date: Tue Jun 26 13:12:08 2007 -0300 V4L/DVB (5793): Tuner: remove hardware-specific info from public header Move internal structures and debug macros to drivers/media/video/tuner-driver.h Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit bebeaea0a54869b59b45ea22a93f325ce0369d61 Author: Antoine Jacquet Date: Mon Jun 25 16:00:34 2007 -0300 V4L/DVB (5792): Zr364xx: add support for Trust Powerc@m 970Z Add Trust Powerc@m 970Z (0x06d6:0x003b) to the list of supported devices. Signed-off-by: Antoine Jacquet Signed-off-by: Mauro Carvalho Chehab commit ea6337417da26a74a3b91c554ae9823995f8a84d Author: Mauro Carvalho Chehab Date: Mon Jun 25 15:42:01 2007 -0300 V4L/DVB (5791): Fix Kbuild for kbd-ir-i2c Potentially, all board types with I2C and IR support can use an i2c based IR. Currently, the driver is selected only if bt848 or saa7134 boards are selected. Signed-off-by: Mauro Carvalho Chehab commit 2f3ed0538b2ac6d63b95c04b0ee0e7b9ac1ee220 Author: Mauro Carvalho Chehab Date: Mon Jun 25 15:33:41 2007 -0300 V4L/DVB (5790): Fix error handling for stv680 Signed-off-by: Mauro Carvalho Chehab commit 2d9078f73eafb2606e1adbb4e551d0cf1f5daf89 Author: Mauro Carvalho Chehab Date: Mon Jun 25 15:21:05 2007 -0300 V4L/DVB (5789): Fix 3dfx Voodoo entries on Cardlist Signed-off-by: Mauro Carvalho Chehab commit 829ea96477e775df0698b54dbfa913b6b55a4d6d Author: Michael Krufky Date: Mon Jun 25 14:54:09 2007 -0300 V4L/DVB (5788): Cx88-input: convert nested if's to switch..case In the function, cx88_ir_handle_key: - convert nested if statement to a switch..case block Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit e7d11ecbde987e56845cff012b4a28d7001667b8 Author: Edgar Pisani Date: Mon Jun 25 14:46:05 2007 -0300 V4L/DVB (5787): Cx88: add remote control support for Leadtek Winfast DTV1000 Signed-off-by: Edgar Pisani Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 39cf1e810a6b464a8469bf318f21206d84ffb1d8 Author: Jan Frey Date: Mon Jun 25 14:34:06 2007 -0300 V4L/DVB (5786): Ir-kbd-i2c: add support for Hauppauge HVR1300 remote - add support for the I2C based IR transceiver of the Hauppauge HVR-1300 - remove bad code from cx88-input.c Signed-off-by: Jan Frey Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 434b25263a236c9dd980617d69863ba0eff8c744 Author: Wade Berrier Date: Mon Jun 25 13:02:16 2007 -0300 V4L/DVB (5785): Revisited: 3dfx Voodoo TV 200 (US) Fix support for 3dfx Voodoo TV 200 variant Signed-off-by: Wade Berrier Signed-off-by: Mauro Carvalho Chehab commit 096bb77abac4e44c37870f4f8adaec813295eb23 Author: Michael Krufky Date: Fri Jun 22 17:41:07 2007 -0300 V4L/DVB (5784): Dibusb-mb: fix tuner autodetection regression We must set i2c_msg.addr in order for the autodetection test to succeed! Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7d816b256df83070e75d4f738c10d66bfc192040 Author: Mauro Carvalho Chehab Date: Fri Jun 22 17:26:54 2007 -0300 V4L/DVB (5783): Fix excess of debug messages on cx88-mpeg Closes the issue opened on Kernel bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=8383 There's no need to print timeout without debug turned on: Apr 27 23:02:14 video kernel: cx88[1]/2-mpeg: cx8802_timeout Signed-off-by: Mauro Carvalho Chehab commit 47a9991e806940f400f90d7b9cbcf7c2925e4fce Author: Michael Krufky Date: Tue Jun 12 16:10:51 2007 -0300 V4L/DVB (5780): Dvb: Remove static dependencies on dvb-pll This patch removes all static dependencies on the dvb-pll module. All exported dvb_pll_desc's have been UNexported, and the caller will reference the individual dvb_pll_desc by it's index in the pll_list array. Signed-off-by: Michael Krufky Signed-off-by: Trent Piepho Signed-off-by: Patrick Boettcher Acked-by: Oliver Endriss Acked-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 6c08d9290e2fc87b217d0f7c9cd67c9240ad7147 Author: Michael Krufky Date: Tue Jun 12 12:43:25 2007 -0300 V4L/DVB (5779): Dibusb-mb: fix broken 'tuner_pass_ctrl' functionality 'tuner_pass_ctrl' functionality of the dib3000-mb devices was broken in the previous changeset: "dibusb-mb: convert pll handling to properly use dvb-pll" This patch fixes this problem by assigning this functionality to the i2c_gate_ctrl callback Signed-off-by: Michael Krufky Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 865dd115c95df6997f3d9dd638e6f92298f0422f Author: Michael Krufky Date: Tue Jun 12 12:40:35 2007 -0300 V4L/DVB (5778): Dvb-usb: kill unused tuner/i2c functions These two functions are no longer being used: dvb_usb_tuner_init_i2c dvb_usb_tuner_set_params_i2c This functionality has been taken over by dvb-pll Signed-off-by: Michael Krufky Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 4ce15678926cef4886df46964142fc2520c216cd Author: Trent Piepho Date: Sat Jun 2 16:30:46 2007 -0300 V4L/DVB (5777): Dvb-pll digitv dvb-usb: Eliminate last user of dvb_pll_configure The last user of dvb_pll_configure was the dvb-usb function dvb_usb_tuner_calc_regs(), which was nothing more than a wrapper around dvb_pll_configure(). It's just a copy of the functionality provided by the tuner_ops calc_regs method, and can be deleted. There were two users of dvb_usb_tuner_calc_regs(). One was dvb_usb_tuner_set_params_i2c(), which is converted to use fe->ops.tuner_ops.calc_regs(). The other was the digitv driver. This driver can use one of two demods, mt352 or nxt6000. For the mt352, the driver would set tuner_ops.calc_regs to dvb_usb_tuner_calc_regs(). We can just attach dvb_pll and use the tuner_ops.calc_regs() provided by that module. For the nxt600, the driver would set tuner_ops.set_params to digitv_nxt6000_tuner_set_params. That function would in turn use dvb_usb_tuner_calc_regs(). We convert it to use tuner_ops.calc_regs() instead, and use dvb_pll_attach. The digitv_tuner_attach() needs to know which frontend was attached by digitv_frontend_attach(), since the nxt6000 needs tuner_ops.set_params() to be overridden with digitv_nxt6000_tuner_set_params(). So, to do this a digitv_state that says which frontend was used is added to the dvb_usb_device private state field. Signed-off-by: Trent Piepho Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit b784e526a8333db57d1b9f385a12553066bdba64 Author: Rafael Bilski Date: Wed Jun 20 05:37:27 2007 -0300 V4L/DVB (5776): Hardware MPEG audio fix for SAA7134 based "KNC One TV-Station DVR" card With previous patch card is generating MPEG audio stream too. Unfortunatly I2S audio output is muted. Unmute it. Signed-off-by: Rafal Bilski Signed-off-by: Mauro Carvalho Chehab commit aac0ca6a8b84541b28af9d18d8b84f90653ce0d0 Author: Rafał Bilski Date: Wed Jun 20 05:36:26 2007 -0300 V4L/DVB (5775): Alsa fix for SAA7134 based "KNC One TV-Station DVR" card Sound recording doesn't work for this card because ACNI and ACPF are not set before snd_card_saa7134_capture_prepare(). As a result timeout occurs. These registers aren't poked because thread never gets wake up signal. ACNI initialization is done in the thread. Sound is muted when capture stops. Shouldn't be because it may be used during TV playback. Signed-off-by: Rafal Bilski Signed-off-by: Mauro Carvalho Chehab commit 6d7930e0cde1b27c3beca399e233be058ac0b93f Author: Michael Krufky Date: Fri Jun 15 19:17:46 2007 -0300 V4L/DVB (5772): Cx88: remove two unused pointers from struct cx8802_dev The following two pointers in struct cx8802_dev are unused - remove them: void* fe_handle; int (*fe_release)(void *handle); Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 302170a4b47e869372974abd885dd11d5536b64a Author: Michael Krufky Date: Fri Jun 15 19:14:52 2007 -0300 V4L/DVB (5771): Get_dvb_firmware: update script for new location Get_dvb_firmware: update script for new location of sp8870 firmware This url is no longer valid: http://www.technotrend.de/new/217g/tt_Premium_217g.zip Replace with: http://www.softwarepatch.pl/9999ccd06a4813cb827dbb0005071c71/tt_Premium_217g.zip Thanks-to: Tobias Stoeber Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f5948bbab04988f2b58e1a7ca893ffcf5dcfa243 Author: Hans Verkuil Date: Sat Jun 16 18:24:47 2007 -0300 V4L/DVB (5770): Ivtv: fix return code of VIDIOC_G/S_FBUF when no FB is present Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 47fd3ba9fc62d23a985f4969719c3091438d21c5 Author: Hans Verkuil Date: Sat Jun 16 17:02:11 2007 -0300 V4L/DVB (5769): Ivtv: fix broken VBI output support The old service_set_out setting was still tested, even though it no longer was ever set and was in fact obsolete. This meant that everything that was written to /dev/vbi16 was ignored. Removed the service_set_out variable altogether and now it works again. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 27b5a3957a205bcaa07952ed27981f69b2b2f764 Author: Hans Verkuil Date: Sat Jun 16 16:46:56 2007 -0300 V4L/DVB (5768): Ivtv: fix converity warning Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4052fcc7ba32ebd54cc907991cb855d909ce9d1c Author: Luca Risolia Date: Wed Jun 13 15:11:15 2007 -0300 V4L/DVB (5767): ZC0301 driver updates - Make the driver depend on V4L2 only (KConfig) - Better and safe locking mechanism of the device structure on open(), close() and disconnect() - Use kref for handling device deallocation - Generic cleanups Signed-off-by: Luca Risolia Signed-off-by: Mauro Carvalho Chehab commit 3b2ae0be9e246974db65a5bf4ccd2de328f3dede Author: Luca Risolia Date: Wed Jun 13 14:52:01 2007 -0300 V4L/DVB (5766): ET61x251 driver updates - Make the driver depend on V4L2 only (KConfig) - Better and safe locking mechanism of the device structure on open(), close() and disconnect() - Use kref for handling device deallocation - Generic cleanups Signed-off-by: Luca Risolia Signed-off-by: Mauro Carvalho Chehab commit 3770be34199ace8c497ce454cebd7d63347dc4c3 Author: Luca Risolia Date: Wed Jun 13 14:37:50 2007 -0300 V4L/DVB (5765): SN9C1xx driver updates - Add support for pair OV7630+SN9C120 - Better and safe locking mechanism of the device structure on open(), close() and disconnect() - Use kref for handling device deallocation - Generic cleanups Signed-off-by: Luca Risolia Signed-off-by: Mauro Carvalho Chehab commit a6e2b40cb430e1e3a22fbb56807edebf71bf6188 Author: Mauro Carvalho Chehab Date: Fri Jun 8 08:21:27 2007 -0300 V4L/DVB (5763): Fix tea5761 unselection Signed-off-by: Mauro Carvalho Chehab commit 5d807c9fc3fe8a88f1bb95a54da11cebed1612a6 Author: Michael Krufky Date: Wed Jun 6 16:17:57 2007 -0300 V4L/DVB (5759): Tuner-simple: store tuning operations in tuner_operations struct Create static struct tuner_operations simple_tuner_ops for tuner-simple tuning function callback pointers Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 0f838f8d02415a25358850cc32d36cd72c2a798b Author: Michael Krufky Date: Wed Jun 6 16:17:17 2007 -0300 V4L/DVB (5758): Tea5767: store tuning operations in tuner_operations structure Create static struct tuner_operations tea5767_tuner_ops for tea5767 tuning function callback pointers Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit e407cd54eecc955b2658106403a294612bf4ed66 Author: Michael Krufky Date: Wed Jun 6 16:16:29 2007 -0300 V4L/DVB (5757): Tea5761: store tuning operations in tuner_operations structure Create static struct tuner_operations tea5761_tuner_ops for tea5761 tuning function callback pointers Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9af596ebc7ad3afb0df520b4becad915dd5a5584 Author: Michael Krufky Date: Wed Jun 6 16:15:48 2007 -0300 V4L/DVB (5756): Tda9887: store tuning operations in tuner_operations structure Create static struct tuner_operations tda9887_tuner_ops for tda9887 tuning function callback pointers Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7fd8b263678ab8430b49c99976ade681f8a78439 Author: Michael Krufky Date: Wed Jun 6 16:15:15 2007 -0300 V4L/DVB (5755): Tda8290: store tuning operations in tuner_operations structure Create static struct tuner_operations tda8290_tuner_ops for tda8290 tuning function callback pointers Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c22bcb07ad4555fe7ac4ce724c8ad1de889f9477 Author: Michael Krufky Date: Wed Jun 6 16:14:18 2007 -0300 V4L/DVB (5754): Mt20xx: store tuning operations in tuner_operations structure Create static struct tuner_operations mt2050_tuner_ops and mt2032_tuner_ops for mt20xx tuning function callback pointers Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 7a91a80a0d1a0a83a94e773ec6245b31b7c4ceed Author: Michael Krufky Date: Wed Jun 6 16:10:39 2007 -0300 V4L/DVB (5753): Tuner: create struct tuner_operations Move tuner callback function pointers out of struct tuner, into struct tuner_operations. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 018ec5440b4994f560cdde78be6fb10d7ab370d7 Author: Mauro Carvalho Chehab Date: Thu Jun 7 08:26:37 2007 -0300 V4L/DVB (5750): Remove obsoleted support for PROC_FS on vicam.c Procfs support on V4L were converted to sysfs support by a pre-2.6 patch: http://www.ussg.iu.edu/hypermail/linux/kernel/0307.1/2356.html There's no sense on keeping the dead code inside vicam.c. Also,it won't work anyway, as part of proc_fs support were previously inside videodev.c. Signed-off-by: Mauro Carvalho Chehab commit 890be2bb55774290479672b98fcb0486b57e758e Author: Mauro Carvalho Chehab Date: Thu Jun 7 08:10:41 2007 -0300 V4L/DVB (5774a): Remove CONFIG_BIGPHYS_AREA from zoran_driver CONFIG_BIGPHYS_AREA is an out-of-tree kernel patch. It makes no sense to keep supporting this on mainstream. The out-of-tree compilation with CONFIG_BIGPHYS_AREA will still be preserved at the v4l-dvb development tree at: http://linuxtv.org/hg/v4l-dvb Signed-off-by: Mauro Carvalho Chehab commit b7c97abd8171709cc35d8aab70b9962fcad9f9fa Author: Michael Krufky Date: Wed Jun 6 15:28:10 2007 -0300 V4L/DVB (5747): Tea5761: remove duplicated "#include " The line, "#include " appears twice. This patch removes the second occurance. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit f3a0d86f1dc60c3ae13ccde188c533e58e7e3197 Author: Trent Piepho Date: Mon Jun 4 20:18:51 2007 -0300 V4L/DVB (5745): Dvb: use '+=' instead of '=' for EXTRA_CFLAGS The Makefiles in the dvb directory tree used '=' when defining EXTRA_CFLAGS rather than '+=', which is far more common in the rest of the kernel source. = 14 times (9 of which this patch removes) := 25 times += 123 times This change also has certain advantages for the out of kernel v4l-dvb build system. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 052c50d91642f10e10c3c10837c89a7355881e76 Author: Michael Krufky Date: Mon Jun 4 16:00:45 2007 -0300 V4L/DVB (5743): Tuner: clean up kfree() after release Although it is safe to kfree(NULL), We only need to kfree(priv) if the release callback is undefined. As it stands now, there is some redundancy in the operation of releasing the priv data structures. This patch will call kfree(priv) and set priv to NULL, if the release callback isnt defined. Otherwise, let the release callback handle this itself. Thanks to Mauro Carvalho Chehab for suggesting this. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 024cf53089f7c8e58934407f07ca2a7b5bed3b06 Author: Michael Krufky Date: Mon Jun 4 15:20:11 2007 -0300 V4L/DVB (5742): Tuner: define release callback for mt20xx, tda9887 and tda8290 Define tuner release callbacks for mt20xx, tda9887 and tda8290, so that these drivers can release their own private structures themselves. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit be2b85a13543bbaf1a141b3a54f84c1e3b059e69 Author: Michael Krufky Date: Mon Jun 4 14:40:27 2007 -0300 V4L/DVB (5741): Tuner: add release callback Individual tuner drivers are now allocating memory themselves for their own private data structures. This changeset adds a release callback to the tuner operations, so that newer drivers that may require more complex data structures may release this private data themselves. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9ee476a56c3ee119a02b6823659f5698b1241f04 Author: Adrian Bunk Date: Tue Jun 5 05:22:00 2007 -0300 V4L/DVB (5740): Git-dvb: fix the tea5761 tuner support Due to a typo the tea5761 tuner support was dead code. This patch also fixes a bug in the no longer dead code: A void function can't return anything. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 0c71bf1c3065e80cc3ab91293829169bdeda2c42 Author: Robert P. J. Day Date: Tue Jun 5 05:20:56 2007 -0300 V4L/DVB (5739): Replace C code with calls to ARRAY_SIZE macro. Signed-off-by: Robert P. J. Day Signed-off-by: Mauro Carvalho Chehab commit e0099e9edabd855bf83d3f57b1843f0b06bfb19d Author: Michael Krufky Date: Wed May 30 13:29:32 2007 -0300 V4L/DVB (5734): Cx88: kill dev->fw_size Now that cx88-blackbird is only accepting the official firmware image, we no longer have any need to store the size of the firmware inside the cx88 data structure. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 25472237320b4979d38eb15bc842f592c94d20f5 Author: Hans Verkuil Date: Wed May 30 09:39:46 2007 -0300 V4L/DVB (5733): Blackbird should accept only new cx2341x encoding firmwares Remove temporary support for older 256 kB firmwares. ivtv, pvrusb2 and blackbird can now all handle the newer larger firmwares, so support for the older (buggier) firmware can be removed. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit a957641bbafc9f44050c965fe1ddc0f7b771d416 Author: Hans Verkuil Date: Tue May 29 07:18:55 2007 -0300 V4L/DVB (5729): Remove support for 256 Kb firmware files. For backwards compatibility firmware files of 256 Kb were allowed: all drivers have now been updated to support the newer larger firmwares so remove this compatibility code and only support the newer firmware. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 74fa39e5902faf1f5eb3ee642e2e069875a0343e Author: Mauro Carvalho Chehab Date: Tue May 29 07:14:59 2007 -0300 V4L/DVB (5727): Remove VIVI_SCATTER vivi scatter method were used as a proof of concept. It can be safelly removed from mainstream, since the current method is faster and better than the previous solution. Signed-off-by: Mauro Carvalho Chehab commit 3e0e38e6e4b6f64f22f2fb6aca36b25f10f779cb Author: Christoph Hellwig Date: Fri Jun 1 20:15:26 2007 -0300 V4L/DVB (5724): Saa7134-tvaudio: kthread conversion Acked-by: Hermann Pitton Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit b208319993ceff7ebfcc6bb914fe94d29e48a891 Author: Michael Krufky Date: Tue May 29 22:54:06 2007 -0300 V4L/DVB (5719): Tuner: Move device-specific private data out of tuner struct Create private data struct for device specific private data. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 56584c9ea9a6dcd672f97ebfeebc4903e8b903bc Author: Michael Krufky Date: Tue May 29 15:36:37 2007 -0300 V4L/DVB (5718): Mt20xx: whitespace cleanup replace leading spaces with tabs Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 2e02b9a717388c99f2c2ef0aa03f86334bbf8fc7 Author: Douglas Schilling Landgraf Date: Sun May 27 14:05:01 2007 -0300 V4L/DVB (5705): Removed unnecessary .hardware from video_device struct. From: Douglas Schilling Landgraf Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 805b35634b6c349738664619a6d2eb8ece02fe63 Author: Robert P. J. Day Date: Mon May 28 16:21:40 2007 -0300 V4L/DVB (5704): Remove worthless references to obsolete MODULE_PARM macro. Remove the long-dead references to the obsolete MODULE_PARM macro. Given that the first one of those is actually misspelled as "MODULE_PARAM", it's clear that they can't have been doing any good. Acked-by: Thierry Merle Signed-off-by: Robert P. J. Day Signed-off-by: Mauro Carvalho Chehab commit 2c8a3a33558d3f5aa18b56eada66fbe712ee6bb7 Author: Dmitry Torokhov Date: Mon Jul 16 09:28:15 2007 -0300 V4L/DVB (5698): Input: drivers/media - switch to using input_dev->dev.parent In preparation for struct class_device -> struct device input core conversion switch to using input_dev->dev.parent when specifying device position in sysfs tree. Signed-off-by: Dmitry Torokhov Acked-by: Thierry Merle Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit afb758c4b03b17ff856f2bd58e488d152b342875 Author: Uwe Bugla Date: Sat May 26 07:56:29 2007 -0300 V4L/DVB (5701): Documentation/dvb/bt8xx.txt update This patch synchronizes the Documentation for bt8xx-based cards to the actual state of kernel 2.6.22-rc1. Signed-off-by: Uwe Bugla Signed-off-by: Manu Abraham Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit d577ee004d1bb4620ae43758ca7a0aa35319faaa Author: Aapo Tahkola Date: Tue May 8 18:33:52 2007 -0300 V4L/DVB (5696): M920x: add missing error handling to prevent syslog spamming Signed-off-by: Aapo Tahkola Signed-off-by: Mauro Carvalho Chehab commit 3ab3b69de52460ee676304aa773cd37b0b952905 Author: Aapo Tahkola Date: Tue May 8 18:23:38 2007 -0300 V4L/DVB (5695): M920x: enable second adapter on LifeView TV Walker Twin Enable second adapter on LifeView TV Walker Twin DVB-T USB2.0 Signed-off-by: Aapo Tahkola Signed-off-by: Mauro Carvalho Chehab commit 3847b22ab59a9110c9e7433ac75751070047280e Author: Aapo Tahkola Date: Tue May 8 18:21:47 2007 -0300 V4L/DVB (5694): M920x: fix for Dposh devices Make sure devices manufactured by Dposh are not affected by previous hw pid filtering changes Doing so might crash it. Signed-off-by: Aapo Tahkola Signed-off-by: Mauro Carvalho Chehab commit 55bbe5ea203373c07c10a9d1d5088dd013345027 Author: Aapo Tahkola Date: Tue May 8 12:56:54 2007 -0300 V4L/DVB (5693): M920x: second endpoint also needs to be changed to alt setting Spotted by Jeremy Nysen. Signed-off-by: Aapo Tahkola Signed-off-by: Mauro Carvalho Chehab commit 47f8df0fc0a5bd2e7e46ca438715ffa290051f72 Author: Aapo Tahkola Date: Tue May 8 12:03:55 2007 -0300 V4L/DVB (5692): M920x: attempt to fix hw pid filters on second endpoint Signed-off-by: Aapo Tahkola Signed-off-by: Mauro Carvalho Chehab commit 31bdc5dc7666aa2fe04c626cea30fe3c20cf481c Merge: 5cc97bf... a5f8967... Author: Linus Torvalds Date: Wed Jul 18 10:23:37 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Set vio->desc_buf to NULL after freeing. [SPARC]: Mark sparc and sparc64 as not having virt_to_bus [SPARC64]: Fix reset handling in VNET driver. [SPARC64]: Handle reset events in vio_link_state_change(). [SPARC64]: Handle LDC resets properly in domain-services driver. [SPARC64]: Massively simplify VIO device layer and support hot add/remove. [SPARC64]: Simplify VNET probing. [SPARC64]: Simplify VDC device probing. [SPARC64]: Add basic infrastructure for MD add/remove notification. commit 7cb47a14609eed6db2041fd1fe888027b2a3c3e0 Author: Daniel Gimpelevich Date: Thu May 17 18:10:17 2007 -0300 V4L/DVB (5685): Cx88: add support for ADS Tech Instant Video PCI Signed-off-by: Daniel Gimpelevich Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8083c5200e74a5db11c9671bfc1bcaefe8c48737 Author: Dmitry Torokhov Date: Mon May 21 11:51:11 2007 -0300 V4L/DVB (5684): V4L: ir-kbd-i2c - switch to using msecs_to_jiffies() Signed-off-by: Dmitry Torokhov Signed-off-by: Mauro Carvalho Chehab commit 749823a06e74620ff3fefc75eab9d6fa473a9b39 Author: Dmitry Torokhov Date: Mon May 21 11:48:11 2007 -0300 V4L/DVB (5683): V4L: cx88 - switch to using msecs_to_jiffies() Signed-off-by: Dmitry Torokhov Signed-off-by: Mauro Carvalho Chehab commit b4ba788425f83e0b402a543c816a1cad01873699 Author: Dmitry Torokhov Date: Mon May 21 11:41:02 2007 -0300 V4L/DVB (5682): SAA7134 - switch to use msecs_to_jiffies() Signed-off-by: Dmitry Torokhov Signed-off-by: Mauro Carvalho Chehab commit c57032decdd07e531fc557a207c9ecd5eef9274d Author: Mauro Carvalho Chehab Date: Mon May 21 11:39:21 2007 -0300 V4L/DVB (5681): Correct aliases for STD/L and STD/Lc Some macros were using very weird names, like PAL/L (this std doesn't exist). Fixing it. Signed-off-by: Mauro Carvalho Chehab commit 783aa8fa1fe666a039edb784d9458647da97d28a Author: Akinobu Mita Date: Sun May 20 09:12:10 2007 -0300 V4L/DVB (5678): Zr364xx: fix return values This patch fixes several return value related problems in zr364xx. - return -ENOMEM instead of -ENODEV on out of memory - zr364xx checks video_register_device() error only when its return value is -1. But video_register_device() doesn't always return -1 on error. - If usb_register() returns error, module_init() wrongly returns 1: retval = usb_register(&zr364xx_driver) < 0; ... return retval; And it allows the module to be loaded. Because sys_init_module() doesn't see positive return value as error. Signed-off-by: Akinobu Mita Signed-off-by: Antoine Jacquet Signed-off-by: Mauro Carvalho Chehab commit 1b9d313c38291c6d60f1fbf6a2bc62c484fdaa21 Author: Hans Verkuil Date: Fri May 18 16:18:17 2007 -0300 V4L/DVB (5674): Models 30012-30039 are for a low profile PVR250, not PVR150. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e80666b87b7f832cad7f824c4ec5799b1c99fa5e Author: Hans Verkuil Date: Thu May 17 06:52:32 2007 -0300 V4L/DVB (5671): Autodetect new PVR150 low profile cards. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f72ce644479fc06774367ed3c80d0f94e54d938b Author: Oliver Endriss Date: Sun May 13 23:25:57 2007 -0300 V4L/DVB (5669): Budget-av: Add support for EasyWatch DVB-S (0x1894:0x001b) Add support for Satelco EasyWatch PCI DVB-S card (subsystem 0x1894:0x001b). Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 7b68814d797ae29095b7651e172c28a31ee37fda Author: Michael Krufky Date: Tue May 8 18:23:40 2007 -0300 V4L/DVB (5637): Cx88: kill core->pll_desc and core->pll_addr Now that dvb-pll is being used properly in all cx88-dvb instances, the cx88 driver no longer needs to store pll_desc nor pll_addr. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit b7754d74d20b701603eacf587a92ec6f71a302e1 Author: Trent Piepho Date: Tue May 8 18:05:16 2007 -0300 V4L/DVB (5636): Integrate all users of the fmd1216 tuner with dvb-pll Enhance the dvb-pll definition of the fmd1216 tuner by adding an init sequence and a sleep sequence. The init sequence sets the AGC control register to 0xa0, selecting the fast time constant and 112 dBuV take-over point. This the recommended value for DVB-T operation. The sleep sequence sets bit P4 (which is believed to turn the analog demodulator on), turns off the tuning voltage, and sets the AGC control register to 0x60 (external AGC voltage, the recommended value for analog operation). The existing dvb-pll users in the cx88 driver, listed below, will gain these init and sleep sequences. CX88_BOARD_HAUPPAUGE_HVR1100 Hauppauge WinTV-HVR1100 DVB-T/Hybrid CX88_BOARD_HAUPPAUGE_HVR1100LP Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profi CX88_BOARD_WINFAST_DTV2000H WinFast DTV2000 H CX88_BOARD_HAUPPAUGE_HVR3000 Hauppauge WinTV-HVR3000 TriMode Analog/DVB-S/DV CX88_BOARD_HAUPPAUGE_HVR1300 Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encod This non-dvb-pll user in the cx88 driver should only gain the sleep sequence, as it already had an equivalent init sequence. The non-dvb-pll code for this user is removed. X88_BOARD_DNTV_LIVE_DVB_T_PRO digitalnow DNTV Live! DVB-T Pro In these saa7134 driver, these non-dvb-pll users are converted to use dvb-pll: SAA7134_BOARD_MD7134 Medion 7134 SAA7134_BOARD_ASUS_EUROPA2_HYBRID Asus Europa2 OEM The saa7134 functions philips_fmd1216_tuner_init(), philips_fmd1216_tuner_sleep(), and philips_fmd1216_tuner_set_params() are deleted and the dvb-pll versions are used. This should result in equivalent sleep, init, and tuning sequences being sent to the tuner. For the cxusb driver, only one board is effected: USB_PID_MEDION_MD95700 Medion MD95700 This board used dvb_usb_tuner_init_i2c() and dvb_usb_tuner_set_params_i2c() for init and tuning, respectively. These functions are effectively the same as the dvb-pll versions. They call a tuner pass control function defined at the dvb-usb level, but this does not matter, as this card does not have a tuner pass control function (only the dib3000mb does). This board will gain the sleep sequence, while init and tuning should be unchanged. Signed-off-by: Trent Piepho Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 4919c49278b3299c1373912dec9c3d9cf27ec56d Author: Aapo Tahkola Date: Tue May 8 17:36:40 2007 -0300 V4L/DVB (5628): Add support for A-LINK DTU dvb-t adapter Support for A-LINK DTU(m) is not included in this patch. Signed-off-by: Aapo Tahkola Acked-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit e62a42090cdeaa6bbd3d22fa25309592c5eebbbd Author: Luca Olivetti Date: Mon May 7 16:57:57 2007 -0300 V4L/DVB (5626): Marked af9005 driver as experimental and fix dependencies Marked af9005 driver as experimental and add dependency for qt1010; Added a dependency on qt1010 in Kconfig; Corrected the experimental gain reduction of the mt2060 in case of strong signal (though it is code included in #ifdef 0). Signed-off-by: Luca Olivetti Signed-off-by: Mauro Carvalho Chehab commit af4e067e1dcf926d9523dff11e46c45fd9fa9da2 Author: Luca Olivetti Date: Mon May 7 15:19:32 2007 -0300 V4L/DVB (5625): Add support for the AF9005 demodulator from Afatech Signed-off-by: Luca Olivetti Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 79d3a8bede9350e2ff28b950341dcfead85ba04b Author: Michael Krufky Date: Wed May 9 14:52:52 2007 -0300 V4L/DVB (5652): Dibusb-mb: use dvb_attach for dib3000mb_attach convert calls to dib3000mb_attach to use dvb_attach Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit fbfee8684ff235c8cc4e8859913a017dabd59c03 Author: Michael Krufky Date: Wed May 9 15:58:17 2007 -0300 V4L/DVB (5651): Dibusb-mb: convert pll handling to properly use dvb-pll moved tda665x pll_init into dvb_pll_desc dvb_pll_tda665x.initdata convert handling of tda665x and tua6010xs to properly use dvb-pll Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 9bc7c04852194377fc276072359a19b5134250cc Author: Michael Krufky Date: Wed May 9 13:34:54 2007 -0300 V4L/DVB (5650): Umt-010: trivial whitespace cleanup Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit a3497135d829a7911b1b6a7e81ab78066cfa4131 Author: Michael Krufky Date: Wed May 9 13:33:21 2007 -0300 V4L/DVB (5649): Umt-010: convert tua6034 handling to properly use dvb-pll Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 890693925218501f7f7afc4cd6706fc76f395b91 Author: Michael Krufky Date: Wed May 9 11:49:24 2007 -0300 V4L/DVB (5648): Dvb/frontends: remove unnecessary #include's of "dvb-pll.h" These sources do not need to #include "dvb-pll.h" Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 480f75acbc1452c0fc7b2ee595bde17c18f798aa Author: Tony Wan Date: Fri May 11 11:33:50 2007 -0300 V4L/DVB (5647): Saa7134: enable ir-remote for 10moons TM300 Using Encore's key codes, we needn't add any additional key table. Signed-off-by: Tony Wan Signed-off-by: Mauro Carvalho Chehab commit aaccb82bdb93889987497b2b712c5160cdf79240 Author: Tony Wan Date: Thu May 10 12:16:47 2007 -0300 V4L/DVB (5646): V4l: saa7134: add support for 10moons TM300 card Support the 10moons TM300 TV card (so called TV Master 3), which is a 10moons saa7130 based board. Here not include features for the IR-remote. It has been tested using TVTIME. The card was auto-detected and all the input sources worked correct with sound. Signed-off-by: Tony Wan Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit c5f48367fe54c46805774eeea8e828de54a5ad7b Author: Thierry MERLE Date: Tue May 8 17:22:29 2007 -0300 V4L/DVB (5644): Usbvision: video_ioctl2 conversion The ioctl entry point, a big switch/case, is splitted in little functions. These functions are set as callbacks for the video_ioctl2 video4linux facility. This improves the driver memory consumption and enables the v4l1 compatibility as a side effect. Signed-off-by: Thierry MERLE Acked-by: Dwaine P. Garden Signed-off-by: Mauro Carvalho Chehab commit ea1f83cee96badc28d3f67ef29ac29c9d0eb0a1b Author: Thierry MERLE Date: Wed May 2 18:43:55 2007 -0300 V4L/DVB (5643): Usbvision: make common video and radio ioctls Radio and video ioctls are the same, delete the usbvision_do_radio_ioctl function add the special cases for radio in usbvision_v4l2_do_ioctl Signed-off-by: Thierry MERLE Signed-off-by: Mauro Carvalho Chehab commit 8c7189d1939f6e15c4ebc23a98b3b9f34bd004d7 Author: David Warman Date: Mon Apr 30 14:17:04 2007 -0300 V4L/DVB (5642): add comment that VO_MODE is also being set. usbvision_set_video_format: add comment that VO_MODE is also being set. Signed-off-by: David Warman Signed-off-by: Thierry MERLE Signed-off-by: Mauro Carvalho Chehab commit 9fe01e5c297e716c6b50166c3c032a6c07604e5b Author: David Warman Date: Mon Apr 30 14:12:19 2007 -0300 V4L/DVB (5641): change VideoNorm to NTSC for Belkin USB Videobus II Signed-off-by: David Warman Signed-off-by: Thierry MERLE Signed-off-by: Mauro Carvalho Chehab commit 9b98fd28b4a181cafaa5247a04d1be6d2ca7c863 Author: Michael Krufky Date: Mon May 7 01:48:56 2007 -0300 V4L/DVB (5635): Budget-av: convert philips sd1878 / tda8261 to use dvb-pll removed philips_sd1878_tda8261_tuner_set_params, using dvb_pll_attach, instead. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 8511df9ec2ef4c33a6b1e76527d5b47da8bc0bb6 Author: Michael Krufky Date: Mon May 7 01:34:36 2007 -0300 V4L/DVB (5634): Saa7134-dvb: convert philips td1316 handling to use dvb-pll removed mt352_aver777_tuner_calc_regs, using dvb_pll_attach, instead. Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 4abe9f9d94e60303c30b1a9bbbc8e6532f6138cb Author: Michael Krufky Date: Sat May 5 12:15:57 2007 -0300 V4L/DVB (5633): Tuv1236d: move rf input switching code into dvb-pll This patch removes duplicate code from cx88-dvb and saa7134-dvb that handles rf input switching for the TUV1236d tuner. The functionality is added to dvb-pll, where all the other code that handles the TUV1236d is kept. Signed-off-by: Michael Krufky Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 77d675047062d514acdc1bbe9f84658b39f99abe Author: Michael Krufky Date: Sat May 5 12:05:39 2007 -0300 V4L/DVB (5632): Dvb-pll: pass dvb_frontend_parameters to generic set() function Rename dvb_pll_desc.setbw() to set(), and accept struct dvb_frontend_parameters instead of passing both freq and bandwidth, so that this may be used as a generic function. In order to do this, dvb_pll_configure must also be altered in the same manner, to take struct dvb_frontend_parameters instead of freq and bandwidth. Signed-off-by: Michael Krufky Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 900858ecb30c27ac94369052be650e25c0fd7d2a Author: Simon Arlott Date: Sun May 6 21:06:32 2007 -0300 V4L/DVB (5631): Dvb-core: Add level fixes to printk()s, plus spelling/grammer All the printks had missing level prefixes so I've fixed these too. Also fixed some grammer errors. Signed-off-by: Simon Arlott Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit ecf854df72847d90d5e44b6676a855677b5a33df Author: Trent Piepho Date: Sat May 5 20:11:32 2007 -0300 V4L/DVB (5629): Cx88: VP3054 support can't be a module when cx88 is compiled in If cx88 support is compiled into the kernel while vp3054 is left as a module, the kernel will fail to link. Adjust the existing "#if" code in cx88 so that it won't consider vp3054 to be supported in this case. It might make sense to move vp3054 selection into the "customisation" menu instead of a cx88 sub-option (though this is a cx88 feature, there is no extra chip involved). It might also make sense to use dvb_attach() to load vp3054 support. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 8573a9e6a8ed724b7e3074dc8762d4117ed0b3aa Author: Mauro Carvalho Chehab Date: Sun Apr 8 01:09:11 2007 -0300 V4L/DVB (5563a): Add experimental support for tea5761 tuner This driver were made based on tea5761 specs. Signed-off-by: Mauro Carvalho Chehab commit 5cc97bf2d8eaa6cab60727c3eba3e85e29062669 Merge: 826ea8f... dfdcdd4... Author: Linus Torvalds Date: Wed Jul 18 10:18:39 2007 -0700 Merge branch 'xen-upstream' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jeremy/xen * 'xen-upstream' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: (44 commits) xen: disable all non-virtual drivers xen: use iret directly when possible xen: suppress abs symbol warnings for unused reloc pointers xen: Attempt to patch inline versions of common operations xen: Place vcpu_info structure into per-cpu memory xen: handle external requests for shutdown, reboot and sysrq xen: machine operations xen: add virtual network device driver xen: add virtual block device driver. xen: add the Xenbus sysfs and virtual device hotplug driver xen: Add grant table support xen: use the hvc console infrastructure for Xen console xen: hack to prevent bad segment register reload xen: lazy-mmu operations xen: Add support for preemption xen: SMP guest support xen: Implement sched_clock xen: Account for stolen time xen: ignore RW mapping of RO pages in pagetable_init xen: Complete pagetable pinning ... commit 826ea8f22cf612d534f33c492c98f7895043bfd1 Author: Tony Breeds Date: Wed Jul 18 16:17:48 2007 +1000 Revert "[POWERPC] Do firmware feature fixups after features are initialised" This reverts commit 5a26f6bbb767d7ad23311a1e81cfdd2bebefb855. The original patch causes boot failures when built with ppc64_defconfig. The quickest fix is to revert it while alterates are investigated. Signed-off-by: Tony Breeds Signed-off-by: Linus Torvalds commit 4f3731da16678026a564b1d7ae218131e4af6810 Author: Tony Breeds Date: Wed Jul 18 11:03:55 2007 +1000 Fix compile failure in arch/powerpc/kernel/pci-common.c This fixes the fallout from the recent powerpc merge (commit 489de30259e667d7bc47da9da44a0270b050cd97): CC arch/powerpc/kernel/pci-common.o arch/powerpc/kernel/pci-common.c:160: error: conflicting types for 'pcibios_add_platform_entries' include/linux/pci.h:889: error: previous declaration of 'pcibios_add_platform_entries' was here Signed-off-by: Tony Breeds Tested-by: Bret Towe Signed-off-by: Linus Torvalds commit dfdcdd42fdf63452ddd1bed6f49ae2a35dfb5d6c Author: Jeremy Fitzhardinge Date: Tue Jul 17 18:37:07 2007 -0700 xen: disable all non-virtual drivers A domU Xen environment has no non-virtual drivers, so make sure they're all disabled at once. Signed-off-by: Jeremy Fitzhardinge Cc: Rusty Ru