View | Details | Raw Unified | Return to bug 8573 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/acpi/battery.c (-6 / +5 lines)
Lines 293-305 static int extract_package(struct acpi_battery *battery, Link Here
293
				strncpy(ptr, (u8 *)&element->integer.value,
293
				strncpy(ptr, (u8 *)&element->integer.value,
294
					sizeof(acpi_integer));
294
					sizeof(acpi_integer));
295
				ptr[sizeof(acpi_integer)] = 0;
295
				ptr[sizeof(acpi_integer)] = 0;
296
			} else return -EFAULT;
296
			} else
297
				*ptr = 0; /* don't have value */
297
		} else {
298
		} else {
298
			if (element->type == ACPI_TYPE_INTEGER) {
299
			int *x = (int *)((u8 *)battery + offsets[i].offset);
299
				int *x = (int *)((u8 *)battery +
300
			*x = (element->type == ACPI_TYPE_INTEGER) ?
300
						offsets[i].offset);
301
				element->integer.value : -1;
301
				*x = element->integer.value;
302
			} else return -EFAULT;
303
		}
302
		}
304
	}
303
	}
305
	return 0;
304
	return 0;

Return to bug 8573