[media] af9015: use logic or instead of sum numbers
authorAntti Palosaari <crope@iki.fi>
Thu, 28 Jul 2011 22:17:59 +0000 (19:17 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 27 Aug 2011 14:14:43 +0000 (11:14 -0300)
Style issue.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/dvb-usb/af9015.c

index d70bbe7..b816600 100644 (file)
@@ -744,31 +744,31 @@ static const struct af9015_rc_setup af9015_rc_setup_hashes[] = {
 };
 
 static const struct af9015_rc_setup af9015_rc_setup_usbids[] = {
-       { (USB_VID_TERRATEC << 16) + USB_PID_TERRATEC_CINERGY_T_STICK_RC,
+       { (USB_VID_TERRATEC << 16) | USB_PID_TERRATEC_CINERGY_T_STICK_RC,
                RC_MAP_TERRATEC_SLIM_2 },
-       { (USB_VID_TERRATEC << 16) + USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC,
+       { (USB_VID_TERRATEC << 16) | USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC,
                RC_MAP_TERRATEC_SLIM },
-       { (USB_VID_VISIONPLUS << 16) + USB_PID_AZUREWAVE_AD_TU700,
+       { (USB_VID_VISIONPLUS << 16) | USB_PID_AZUREWAVE_AD_TU700,
                RC_MAP_AZUREWAVE_AD_TU700 },
-       { (USB_VID_VISIONPLUS << 16) + USB_PID_TINYTWIN,
+       { (USB_VID_VISIONPLUS << 16) | USB_PID_TINYTWIN,
                RC_MAP_AZUREWAVE_AD_TU700 },
-       { (USB_VID_MSI_2 << 16) + USB_PID_MSI_DIGI_VOX_MINI_III,
+       { (USB_VID_MSI_2 << 16) | USB_PID_MSI_DIGI_VOX_MINI_III,
                RC_MAP_MSI_DIGIVOX_III },
-       { (USB_VID_MSI_2 << 16) + USB_PID_MSI_DIGIVOX_DUO,
+       { (USB_VID_MSI_2 << 16) | USB_PID_MSI_DIGIVOX_DUO,
                RC_MAP_MSI_DIGIVOX_III },
-       { (USB_VID_LEADTEK << 16) + USB_PID_WINFAST_DTV_DONGLE_GOLD,
+       { (USB_VID_LEADTEK << 16) | USB_PID_WINFAST_DTV_DONGLE_GOLD,
                RC_MAP_LEADTEK_Y04G0051 },
-       { (USB_VID_LEADTEK << 16) + USB_PID_WINFAST_DTV2000DS,
+       { (USB_VID_LEADTEK << 16) | USB_PID_WINFAST_DTV2000DS,
                RC_MAP_LEADTEK_Y04G0051 },
-       { (USB_VID_AVERMEDIA << 16) + USB_PID_AVERMEDIA_VOLAR_X,
+       { (USB_VID_AVERMEDIA << 16) | USB_PID_AVERMEDIA_VOLAR_X,
                RC_MAP_AVERMEDIA_M135A },
-       { (USB_VID_AFATECH << 16) + USB_PID_TREKSTOR_DVBT,
+       { (USB_VID_AFATECH << 16) | USB_PID_TREKSTOR_DVBT,
                RC_MAP_TREKSTOR },
-       { (USB_VID_KWORLD_2 << 16) + USB_PID_TINYTWIN_2,
+       { (USB_VID_KWORLD_2 << 16) | USB_PID_TINYTWIN_2,
                RC_MAP_DIGITALNOW_TINYTWIN },
-       { (USB_VID_GTEK << 16) + USB_PID_TINYTWIN_3,
+       { (USB_VID_GTEK << 16) | USB_PID_TINYTWIN_3,
                RC_MAP_DIGITALNOW_TINYTWIN },
-       { (USB_VID_KWORLD_2 << 16) + USB_PID_SVEON_STV22,
+       { (USB_VID_KWORLD_2 << 16) | USB_PID_SVEON_STV22,
                RC_MAP_MSI_DIGIVOX_III },
        { }
 };