diff options
| author | Rafael Lourenço de Lima Chehab <chehabrafael@gmail.com> | 2015-06-08 22:20:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-06-10 12:39:35 -0300 |
| commit | e42c8c6eb456f8978de417ea349eef676ef4385c (patch) | |
| tree | 556fd547a3fa0f16c26911f4131c18fd719a62b5 /drivers | |
| parent | 48c91aadc5372f2c3a9b7da11403f86ef2118b26 (diff) | |
| download | linux-stable-e42c8c6eb456f8978de417ea349eef676ef4385c.tar.gz linux-stable-e42c8c6eb456f8978de417ea349eef676ef4385c.tar.bz2 linux-stable-e42c8c6eb456f8978de417ea349eef676ef4385c.zip | |
[media] au0828: move dev->boards atribuition to happen earlier
The attribution of dev->boards occured too late, which
would couse an OOPS in media controller registration.
Signed-off-by: Rafael Lourenço de Lima Chehab <chehabrafael@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/usb/au0828/au0828-cards.c | 2 | ||||
| -rw-r--r-- | drivers/media/usb/au0828/au0828-core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/au0828/au0828-cards.c b/drivers/media/usb/au0828/au0828-cards.c index edc27355f271..6b469e8c4c6e 100644 --- a/drivers/media/usb/au0828/au0828-cards.c +++ b/drivers/media/usb/au0828/au0828-cards.c @@ -195,8 +195,6 @@ void au0828_card_setup(struct au0828_dev *dev) dprintk(1, "%s()\n", __func__); - dev->board = au0828_boards[dev->boardnr]; - if (dev->i2c_rc == 0) { dev->i2c_client.addr = 0xa0 >> 1; tveeprom_read(&dev->i2c_client, eeprom, sizeof(eeprom)); diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c index 082ae6ba492f..0934024fb89d 100644 --- a/drivers/media/usb/au0828/au0828-core.c +++ b/drivers/media/usb/au0828/au0828-core.c @@ -222,6 +222,8 @@ static int au0828_usb_probe(struct usb_interface *interface, mutex_init(&dev->dvb.lock); dev->usbdev = usbdev; dev->boardnr = id->driver_info; + dev->board = au0828_boards[dev->boardnr]; + #ifdef CONFIG_VIDEO_AU0828_V4L2 dev->v4l2_dev.release = au0828_usb_v4l2_release; |