diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/message/fusion/mptscsih.c | 1 | ||||
| -rw-r--r-- | drivers/video/backlight/locomolcd.c | 38 |
2 files changed, 26 insertions, 13 deletions
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 0c3ced70707b..164afa71bba7 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
| @@ -792,6 +792,7 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr) | |||
| 792 | * than an unsolicited DID_ABORT. | 792 | * than an unsolicited DID_ABORT. |
| 793 | */ | 793 | */ |
| 794 | sc->result = DID_RESET << 16; | 794 | sc->result = DID_RESET << 16; |
| 795 | break; | ||
| 795 | 796 | ||
| 796 | case MPI_IOCSTATUS_SCSI_EXT_TERMINATED: /* 0x004C */ | 797 | case MPI_IOCSTATUS_SCSI_EXT_TERMINATED: /* 0x004C */ |
| 797 | if (ioc->bus_type == FC) | 798 | if (ioc->bus_type == FC) |
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c index 3a6d5419e3e3..146fea8aa431 100644 --- a/drivers/video/backlight/locomolcd.c +++ b/drivers/video/backlight/locomolcd.c | |||
| @@ -107,7 +107,6 @@ void locomolcd_power(int on) | |||
| 107 | } | 107 | } |
| 108 | EXPORT_SYMBOL(locomolcd_power); | 108 | EXPORT_SYMBOL(locomolcd_power); |
| 109 | 109 | ||
| 110 | |||
| 111 | static int current_intensity; | 110 | static int current_intensity; |
| 112 | 111 | ||
| 113 | static int locomolcd_set_intensity(struct backlight_device *bd) | 112 | static int locomolcd_set_intensity(struct backlight_device *bd) |
| @@ -122,13 +121,25 @@ static int locomolcd_set_intensity(struct backlight_device *bd) | |||
| 122 | intensity = 0; | 121 | intensity = 0; |
| 123 | 122 | ||
| 124 | switch (intensity) { | 123 | switch (intensity) { |
| 125 | /* AC and non-AC are handled differently, but produce same results in sharp code? */ | 124 | /* |
| 126 | case 0: locomo_frontlight_set(locomolcd_dev, 0, 0, 161); break; | 125 | * AC and non-AC are handled differently, |
| 127 | case 1: locomo_frontlight_set(locomolcd_dev, 117, 0, 161); break; | 126 | * but produce same results in sharp code? |
| 128 | case 2: locomo_frontlight_set(locomolcd_dev, 163, 0, 148); break; | 127 | */ |
| 129 | case 3: locomo_frontlight_set(locomolcd_dev, 194, 0, 161); break; | 128 | case 0: |
| 130 | case 4: locomo_frontlight_set(locomolcd_dev, 194, 1, 161); break; | 129 | locomo_frontlight_set(locomolcd_dev, 0, 0, 161); |
| 131 | 130 | break; | |
| 131 | case 1: | ||
| 132 | locomo_frontlight_set(locomolcd_dev, 117, 0, 161); | ||
| 133 | break; | ||
| 134 | case 2: | ||
| 135 | locomo_frontlight_set(locomolcd_dev, 163, 0, 148); | ||
| 136 | break; | ||
| 137 | case 3: | ||
| 138 | locomo_frontlight_set(locomolcd_dev, 194, 0, 161); | ||
| 139 | break; | ||
| 140 | case 4: | ||
| 141 | locomo_frontlight_set(locomolcd_dev, 194, 1, 161); | ||
| 142 | break; | ||
| 132 | default: | 143 | default: |
| 133 | return -ENODEV; | 144 | return -ENODEV; |
| 134 | } | 145 | } |
| @@ -175,9 +186,11 @@ static int locomolcd_probe(struct locomo_dev *ldev) | |||
| 175 | 186 | ||
| 176 | locomo_gpio_set_dir(ldev->dev.parent, LOCOMO_GPIO_FL_VR, 0); | 187 | locomo_gpio_set_dir(ldev->dev.parent, LOCOMO_GPIO_FL_VR, 0); |
| 177 | 188 | ||
| 178 | /* the poodle_lcd_power function is called for the first time | 189 | /* |
| 190 | * the poodle_lcd_power function is called for the first time | ||
| 179 | * from fs_initcall, which is before locomo is activated. | 191 | * from fs_initcall, which is before locomo is activated. |
| 180 | * We need to recall poodle_lcd_power here*/ | 192 | * We need to recall poodle_lcd_power here |
| 193 | */ | ||
| 181 | if (machine_is_poodle()) | 194 | if (machine_is_poodle()) |
| 182 | locomolcd_power(1); | 195 | locomolcd_power(1); |
| 183 | 196 | ||
| @@ -190,8 +203,8 @@ static int locomolcd_probe(struct locomo_dev *ldev) | |||
| 190 | &ldev->dev, NULL, | 203 | &ldev->dev, NULL, |
| 191 | &locomobl_data, &props); | 204 | &locomobl_data, &props); |
| 192 | 205 | ||
| 193 | if (IS_ERR (locomolcd_bl_device)) | 206 | if (IS_ERR(locomolcd_bl_device)) |
| 194 | return PTR_ERR (locomolcd_bl_device); | 207 | return PTR_ERR(locomolcd_bl_device); |
| 195 | 208 | ||
| 196 | /* Set up frontlight so that screen is readable */ | 209 | /* Set up frontlight so that screen is readable */ |
| 197 | locomolcd_bl_device->props.brightness = 2; | 210 | locomolcd_bl_device->props.brightness = 2; |
| @@ -226,7 +239,6 @@ static struct locomo_driver poodle_lcd_driver = { | |||
| 226 | .resume = locomolcd_resume, | 239 | .resume = locomolcd_resume, |
| 227 | }; | 240 | }; |
| 228 | 241 | ||
| 229 | |||
| 230 | static int __init locomolcd_init(void) | 242 | static int __init locomolcd_init(void) |
| 231 | { | 243 | { |
| 232 | return locomo_driver_register(&poodle_lcd_driver); | 244 | return locomo_driver_register(&poodle_lcd_driver); |
