diff options
author | Antti Palosaari <crope@iki.fi> | 2010-10-07 20:37:06 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:17:59 -0400 |
commit | 9a3ecc738258f22b7c09050ca219b37c9eaae6d5 (patch) | |
tree | 4fa27a2cf828778ba7cd98b3c326650600825d9b /drivers/media/dvb | |
parent | 8ccdf1ae9d223d144919788c221c1c559fa56588 (diff) |
[media] af9015: make checkpatch.pl happy
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/dvb-usb/af9015.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c index 8c073ab30832..2d4f4845c9f5 100644 --- a/drivers/media/dvb/dvb-usb/af9015.c +++ b/drivers/media/dvb/dvb-usb/af9015.c | |||
@@ -969,8 +969,10 @@ error: | |||
969 | content :-( Override some wrong values here. Ditto for the | 969 | content :-( Override some wrong values here. Ditto for the |
970 | AVerTV Red HD+ (A850T) device. */ | 970 | AVerTV Red HD+ (A850T) device. */ |
971 | if (le16_to_cpu(udev->descriptor.idVendor) == USB_VID_AVERMEDIA && | 971 | if (le16_to_cpu(udev->descriptor.idVendor) == USB_VID_AVERMEDIA && |
972 | ((le16_to_cpu(udev->descriptor.idProduct) == USB_PID_AVERMEDIA_A850) || | 972 | ((le16_to_cpu(udev->descriptor.idProduct) == |
973 | (le16_to_cpu(udev->descriptor.idProduct) == USB_PID_AVERMEDIA_A850T))) { | 973 | USB_PID_AVERMEDIA_A850) || |
974 | (le16_to_cpu(udev->descriptor.idProduct) == | ||
975 | USB_PID_AVERMEDIA_A850T))) { | ||
974 | deb_info("%s: AverMedia A850: overriding config\n", __func__); | 976 | deb_info("%s: AverMedia A850: overriding config\n", __func__); |
975 | /* disable dual mode */ | 977 | /* disable dual mode */ |
976 | af9015_config.dual_mode = 0; | 978 | af9015_config.dual_mode = 0; |
@@ -1203,7 +1205,7 @@ static int af9015_tuner_attach(struct dvb_usb_adapter *adap) | |||
1203 | struct af9015_state *state = adap->dev->priv; | 1205 | struct af9015_state *state = adap->dev->priv; |
1204 | struct i2c_adapter *i2c_adap; | 1206 | struct i2c_adapter *i2c_adap; |
1205 | int ret; | 1207 | int ret; |
1206 | deb_info("%s: \n", __func__); | 1208 | deb_info("%s:\n", __func__); |
1207 | 1209 | ||
1208 | /* select I2C adapter */ | 1210 | /* select I2C adapter */ |
1209 | if (adap->id == 0) | 1211 | if (adap->id == 0) |
@@ -1690,7 +1692,7 @@ static int af9015_usb_probe(struct usb_interface *intf, | |||
1690 | static void af9015_i2c_exit(struct dvb_usb_device *d) | 1692 | static void af9015_i2c_exit(struct dvb_usb_device *d) |
1691 | { | 1693 | { |
1692 | struct af9015_state *state = d->priv; | 1694 | struct af9015_state *state = d->priv; |
1693 | deb_info("%s: \n", __func__); | 1695 | deb_info("%s:\n", __func__); |
1694 | 1696 | ||
1695 | /* remove 2nd I2C adapter */ | 1697 | /* remove 2nd I2C adapter */ |
1696 | if (d->state & DVB_USB_STATE_I2C) | 1698 | if (d->state & DVB_USB_STATE_I2C) |
@@ -1700,7 +1702,7 @@ static void af9015_i2c_exit(struct dvb_usb_device *d) | |||
1700 | static void af9015_usb_device_exit(struct usb_interface *intf) | 1702 | static void af9015_usb_device_exit(struct usb_interface *intf) |
1701 | { | 1703 | { |
1702 | struct dvb_usb_device *d = usb_get_intfdata(intf); | 1704 | struct dvb_usb_device *d = usb_get_intfdata(intf); |
1703 | deb_info("%s: \n", __func__); | 1705 | deb_info("%s:\n", __func__); |
1704 | 1706 | ||
1705 | /* remove 2nd I2C adapter */ | 1707 | /* remove 2nd I2C adapter */ |
1706 | if (d != NULL && d->desc != NULL) | 1708 | if (d != NULL && d->desc != NULL) |