Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9ca01e780f8966a7a94f88ef5c54f340e117abea
Commit:     9ca01e780f8966a7a94f88ef5c54f340e117abea
Parent:     ad35ce9e3e03b1515c8581bababb0e64d05cf1ad
Author:     Chris Pascoe <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 2 06:54:17 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 19:04:00 2008 -0200

    V4L/DVB (6853): xc2028: check HAS_IF flag against table
    
    When searching for the right S-Code table to load, check the HAS_IF flag
    against the firmware we are checking instead of against the the "type"
    requested.  We already ignore the scode type requested if the caller passed
    an int_freq; this makes the search by frequency consistent with that 
behaviour.
    
    Signed-off-by: Chris Pascoe <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/tuner-xc2028.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/video/tuner-xc2028.c 
b/drivers/media/video/tuner-xc2028.c
index 81cc7f6..a6b05df 100644
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -592,7 +592,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int 
type,
        } else {
                for (pos = 0; pos < priv->firm_size; pos++) {
                        if ((priv->firm[pos].int_freq == int_freq) &&
-                           (type & HAS_IF))
+                           (priv->firm[pos].type & HAS_IF))
                                break;
                }
                if (pos == priv->firm_size)
@@ -601,7 +601,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int 
type,
 
        p = priv->firm[pos].ptr;
 
-       if (type & HAS_IF) {
+       if (priv->firm[pos].type & HAS_IF) {
                if (priv->firm[pos].size != 12 * 16 || scode >= 16)
                        return -EINVAL;
                p += 12 * scode;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to