diff options
-rw-r--r-- | drivers/i2c/busses/i2c-designware-platdrv.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 4d6a6b94e2fa..353adc4dc583 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c | |||
@@ -80,7 +80,6 @@ static void dw_i2c_acpi_params(struct platform_device *pdev, char method[], | |||
80 | static int dw_i2c_acpi_configure(struct platform_device *pdev) | 80 | static int dw_i2c_acpi_configure(struct platform_device *pdev) |
81 | { | 81 | { |
82 | struct dw_i2c_dev *dev = platform_get_drvdata(pdev); | 82 | struct dw_i2c_dev *dev = platform_get_drvdata(pdev); |
83 | bool fs_mode = dev->master_cfg & DW_IC_CON_SPEED_FAST; | ||
84 | 83 | ||
85 | if (!ACPI_HANDLE(&pdev->dev)) | 84 | if (!ACPI_HANDLE(&pdev->dev)) |
86 | return -ENODEV; | 85 | return -ENODEV; |
@@ -93,10 +92,9 @@ static int dw_i2c_acpi_configure(struct platform_device *pdev) | |||
93 | * Try to get SDA hold time and *CNT values from an ACPI method if | 92 | * Try to get SDA hold time and *CNT values from an ACPI method if |
94 | * it exists for both supported speed modes. | 93 | * it exists for both supported speed modes. |
95 | */ | 94 | */ |
96 | dw_i2c_acpi_params(pdev, "SSCN", &dev->ss_hcnt, &dev->ss_lcnt, | 95 | dw_i2c_acpi_params(pdev, "SSCN", &dev->ss_hcnt, &dev->ss_lcnt, NULL); |
97 | fs_mode ? NULL : &dev->sda_hold_time); | ||
98 | dw_i2c_acpi_params(pdev, "FMCN", &dev->fs_hcnt, &dev->fs_lcnt, | 96 | dw_i2c_acpi_params(pdev, "FMCN", &dev->fs_hcnt, &dev->fs_lcnt, |
99 | fs_mode ? &dev->sda_hold_time : NULL); | 97 | &dev->sda_hold_time); |
100 | 98 | ||
101 | return 0; | 99 | return 0; |
102 | } | 100 | } |