OSDN Git Service

[media] av7110: avoid switch fall through
authorMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 19 May 2017 12:01:24 +0000 (09:01 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 19 May 2017 12:01:24 +0000 (09:01 -0300)
On two switches, this driver have unannotated switch
fall through.

in the first case, it falls through a return. On the second
one, it prints undesired log messages on fall through.

Solve that by copying the commands that it should be
running. Gcc will very likely optimize it anyway, so this
sholdn't be causing any harm, and shuts up gcc warnings.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/pci/ttpci/av7110.c

index df9395c..f2905bd 100644 (file)
@@ -336,6 +336,7 @@ static int DvbDmxFilterCallback(u8 *buffer1, size_t buffer1_len,
                        av7110_p2t_write(buffer1, buffer1_len,
                                         dvbdmxfilter->feed->pid,
                                         &av7110->p2t_filter[dvbdmxfilter->index]);
+               return 0;
        default:
                return 0;
        }
@@ -451,8 +452,12 @@ static void debiirq(unsigned long cookie)
 
        case DATA_CI_PUT:
                dprintk(4, "debi DATA_CI_PUT\n");
+               xfer = TX_BUFF;
+               break;
        case DATA_MPEG_PLAY:
                dprintk(4, "debi DATA_MPEG_PLAY\n");
+               xfer = TX_BUFF;
+               break;
        case DATA_BMP_LOAD:
                dprintk(4, "debi DATA_BMP_LOAD\n");
                xfer = TX_BUFF;