Skip to content

Commit 17c3827

Browse files
committed
media: atomisp: don't set hpll_freq twice with different values
The logic which sets the hpll_freq for BYT sets hpll_freq to 1600MHz, but ignores it, and sets it again after reading from-device-specific EFI vars (this time, using a default of 2000MHz). Remove the first set, as this will be overriden anyway. While here, do minor adjustments on comments and on a printk message. Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent c371af6 commit 17c3827

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

drivers/staging/media/atomisp/pci/atomisp_v4l2.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,10 +1653,12 @@ static int atomisp_pci_probe(struct pci_dev *dev,
16531653
* resolution accordingly.
16541654
*/
16551655
isp->dfs = &dfs_config_byt;
1656-
isp->hpll_freq = HPLL_FREQ_1600MHZ;
1657-
/* HPLL frequency is known to be device-specific, but we don't
1656+
1657+
/*
1658+
* HPLL frequency is known to be device-specific, but we don't
16581659
* have specs yet for exactly how it varies. Default to
1659-
* BYT-CR but let provisioning set it via EFI variable */
1660+
* BYT-CR but let provisioning set it via EFI variable
1661+
*/
16601662
isp->hpll_freq = gmin_get_var_int(&dev->dev, false, "HpllFreq",
16611663
HPLL_FREQ_2000MHZ);
16621664

@@ -1708,7 +1710,7 @@ static int atomisp_pci_probe(struct pci_dev *dev,
17081710
default:
17091711
isp->hpll_freq = HPLL_FREQ_1600MHZ;
17101712
dev_warn(isp->dev,
1711-
"read HPLL from cck failed.default 1600MHz.\n");
1713+
"read HPLL from cck failed. Default to 1600 MHz.\n");
17121714
}
17131715
break;
17141716
default:

0 commit comments

Comments
 (0)