]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[media] cx23885-dvb: move initialization of a8293_pdata
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 18 Dec 2015 16:22:21 +0000 (14:22 -0200)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 18 Dec 2015 17:20:44 +0000 (15:20 -0200)
Smatch complains about where the au8293_data is placed:

drivers/media/pci/cx23885/cx23885-dvb.c:2174 dvb_register() info: 'a8293_pdata' is not actually initialized (unreached code).

It is not actually expected to have such initialization at

switch {
foo = bar;

case:
...
}

Not really sure how gcc does that, but this is something that I would
expect that different compilers would do different things.

David Howells checked with the compiler people: it's not really expected to
initialise as expected.

So, move the initialization outside the switch(), making smatch to
shut up one warning.

Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/pci/cx23885/cx23885-dvb.c

index adabb0bc21adfdf8126b43c0fd620749e99dbc59..80319bb73d94dc25545e33c8ccefab9ed6f26497 100644 (file)
@@ -2168,10 +2168,11 @@ static int dvb_register(struct cx23885_tsport *port)
                }
                port->i2c_client_tuner = client_tuner;
                break;
-       case CX23885_BOARD_HAUPPAUGE_HVR5525:
-               switch (port->nr) {
+       case CX23885_BOARD_HAUPPAUGE_HVR5525: {
                struct m88rs6000t_config m88rs6000t_config;
-               struct a8293_platform_data a8293_pdata = { 0 };
+               struct a8293_platform_data a8293_pdata = {};
+
+               switch (port->nr) {
 
                /* port b - satellite */
                case 1:
@@ -2267,6 +2268,7 @@ static int dvb_register(struct cx23885_tsport *port)
                        break;
                }
                break;
+       }
        default:
                printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "
                        " isn't supported yet\n",