From f27b351232806eeb940366c838be6073ffcb03dc Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 11 Mar 2013 11:48:24 -0700 Subject: [PATCH] 3.0-stable patches added patches: drm-radeon-add-primary-dac-adj-quirk-for-r200-board.patch hwmon-sht15-check-return-value-of-regulator_enable.patch --- ...primary-dac-adj-quirk-for-r200-board.patch | 37 +++++++++++++++++++ ...eck-return-value-of-regulator_enable.patch | 36 ++++++++++++++++++ queue-3.0/series | 2 + 3 files changed, 75 insertions(+) create mode 100644 queue-3.0/drm-radeon-add-primary-dac-adj-quirk-for-r200-board.patch create mode 100644 queue-3.0/hwmon-sht15-check-return-value-of-regulator_enable.patch diff --git a/queue-3.0/drm-radeon-add-primary-dac-adj-quirk-for-r200-board.patch b/queue-3.0/drm-radeon-add-primary-dac-adj-quirk-for-r200-board.patch new file mode 100644 index 00000000000..226bcfb669c --- /dev/null +++ b/queue-3.0/drm-radeon-add-primary-dac-adj-quirk-for-r200-board.patch @@ -0,0 +1,37 @@ +From e8fc41377f5037ff7a661ea06adc05f1daec1548 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Wed, 27 Feb 2013 12:01:58 -0500 +Subject: drm/radeon: add primary dac adj quirk for R200 board + +From: Alex Deucher + +commit e8fc41377f5037ff7a661ea06adc05f1daec1548 upstream. + +vbios values are wrong leading to colors that are +too bright. Use the default values instead. + +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/radeon_combios.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/drivers/gpu/drm/radeon/radeon_combios.c ++++ b/drivers/gpu/drm/radeon/radeon_combios.c +@@ -958,6 +958,15 @@ struct radeon_encoder_primary_dac *radeo + found = 1; + } + ++ /* quirks */ ++ /* Radeon 9100 (R200) */ ++ if ((dev->pdev->device == 0x514D) && ++ (dev->pdev->subsystem_vendor == 0x174B) && ++ (dev->pdev->subsystem_device == 0x7149)) { ++ /* vbios value is bad, use the default */ ++ found = 0; ++ } ++ + if (!found) /* fallback to defaults */ + radeon_legacy_get_primary_dac_info_from_table(rdev, p_dac); + diff --git a/queue-3.0/hwmon-sht15-check-return-value-of-regulator_enable.patch b/queue-3.0/hwmon-sht15-check-return-value-of-regulator_enable.patch new file mode 100644 index 00000000000..c92901cb862 --- /dev/null +++ b/queue-3.0/hwmon-sht15-check-return-value-of-regulator_enable.patch @@ -0,0 +1,36 @@ +From 3e78080f81481aa8340374d5a37ae033c1cf4272 Mon Sep 17 00:00:00 2001 +From: Mark Brown +Date: Sat, 2 Mar 2013 15:33:30 +0800 +Subject: hwmon: (sht15) Check return value of regulator_enable() + +From: Mark Brown + +commit 3e78080f81481aa8340374d5a37ae033c1cf4272 upstream. + +Not having power is a pretty serious error so check that we are able to +enable the supply and error out if we can't. + +Signed-off-by: Mark Brown +Signed-off-by: Guenter Roeck + +--- + drivers/hwmon/sht15.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +--- a/drivers/hwmon/sht15.c ++++ b/drivers/hwmon/sht15.c +@@ -926,7 +926,13 @@ static int __devinit sht15_probe(struct + if (voltage) + data->supply_uV = voltage; + +- regulator_enable(data->reg); ++ ret = regulator_enable(data->reg); ++ if (ret != 0) { ++ dev_err(&pdev->dev, ++ "failed to enable regulator: %d\n", ret); ++ return ret; ++ } ++ + /* + * Setup a notifier block to update this if another device + * causes the voltage to change diff --git a/queue-3.0/series b/queue-3.0/series index ceafac7dcce..6c7a4640922 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -8,3 +8,5 @@ sunrpc-don-t-start-the-retransmission-timer-when-out-of-socket-space.patch hw_random-make-buffer-usable-in-scatterlist.patch ath9k-fix-rssi-dummy-marker-value.patch md-raid0-fix-error-return-from-create_stripe_zones.patch +hwmon-sht15-check-return-value-of-regulator_enable.patch +drm-radeon-add-primary-dac-adj-quirk-for-r200-board.patch -- 2.47.3