Re: 2.6.8-rc2-mm1

[Johannes Stezenbach <js@convergence.de>]

On Wed, Jul 28, 2004 at 02:04:44AM -0700, Andrew Morton wrote:
> 
> - If people have patches in here which are important for a 2.6.8 release,
>   please let me know.
...
> +dvb-major-number.patch
> 
>  Use the right major in DVB

I would like to see this patch go into 2.6.8. We already changed
the major number in linuxtv.org CVS and announced it on our
website, so this might help keep the time of confusion for
DVB users short.

The patch below should go along with it. It fixes some breakage
in dvb_usercopy() introduced by Al Viro's sparse cleanups in -rc2.
(A similar patch might have been mailed already by Michael Hunold.)

Signed-off-by: Johannes Stezenbach <js@convergence.de>

--- linux-2.6.8-rc2/drivers/media/dvb/dvb-core/dvb_functions.c.orig	2004-07-29 00:19:50.000000000 +0200
+++ linux-2.6.8-rc2/drivers/media/dvb/dvb-core/dvb_functions.c	2004-07-29 00:20:05.000000000 +0200
@@ -36,7 +36,7 @@ int dvb_usercopy(struct inode *inode, st
         /*  Copy arguments into temp kernel buffer  */
         switch (_IOC_DIR(cmd)) {
         case _IOC_NONE:
-                parg = NULL;
+                parg = (void *) arg;
                 break;
         case _IOC_READ: /* some v4l ioctls are marked wrong ... */
         case _IOC_WRITE:

Johannes