Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic…

…23/iio into staging-next

Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic…
…23/iio into staging-next
Greg Kroah-Hartman
2 parents c14d1769ba 06d5199d4c
Showing 4 changed files Side-by-side Diff
drivers/staging/iio/Documentation/iio_utils.h
drivers/staging/iio/accel/adis16204_core.c
drivers/staging/iio/accel/adis16240_core.c
drivers/staging/iio/adc/ad7793.c
@@ -158,7 +158,8 @@
 				     &padint, shift);
 			if (ret < 0) {
 				printf("failed to pass scan type description\n");
-				return ret;
+				ret = -errno;
+				goto error_close_sysfsfp;
 			}
 			*be = (endianchar == 'b');
 			*bytes = padint / 8;
  
@@ -174,7 +175,11 @@
 			free(filename);
  
 			filename = 0;
+			sysfsfp = 0;
 		}
+error_close_sysfsfp:
+	if (sysfsfp)
+		fclose(sysfsfp);
 error_free_filename:
 	if (filename)
 		free(filename);
  
  
  
  
  
  
@@ -468,23 +473,30 @@
 						+ strlen(type)
 						+ numstrlen
 						+ 6);
-				if (filename == NULL)
+				if (filename == NULL) {
+					closedir(dp);
 					return -ENOMEM;
+				}
 				sprintf(filename, "%s%s%d/name",
 					iio_dir,
 					type,
 					number);
 				nameFile = fopen(filename, "r");
-				if (!nameFile)
+				if (!nameFile) {
+					free(filename);
 					continue;
+				}
 				free(filename);
 				fscanf(nameFile, "%s", thisname);
-				if (strcmp(name, thisname) == 0)
-					return number;
 				fclose(nameFile);
+				if (strcmp(name, thisname) == 0) {
+					closedir(dp);
+					return number;
+				}
 			}
 		}
 	}
+	closedir(dp);
 	return -ENODEV;
 }
  
@@ -513,6 +525,7 @@
 			goto error_free;
 		}
 		fscanf(sysfsfp, "%d", &test);
+		fclose(sysfsfp);
 		if (test != val) {
 			printf("Possible failure in int write %d to %s%s\n",
 				val,
@@ -562,6 +575,7 @@
 			goto error_free;
 		}
 		fscanf(sysfsfp, "%s", temp);
+		fclose(sysfsfp);
 		if (strcmp(temp, val) != 0) {
 			printf("Possible failure in string write of %s "
 				"Should be %s "
@@ -381,7 +381,7 @@
 			return IIO_VAL_INT_PLUS_MICRO;
 		case IIO_ACCEL:
 			*val = 0;
-			if (chan->channel == 'x')
+			if (chan->channel2 == IIO_MOD_X)
 				*val2 = 17125;
 			else
 				*val2 = 8407;
@@ -500,7 +500,8 @@
 		.channel2 = IIO_MOD_X,
 		.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
 		IIO_CHAN_INFO_SCALE_SHARED_BIT |
-		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
+		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+		IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
 		.address = accel_x,
 		.scan_index = ADIS16240_SCAN_ACC_X,
 		.scan_type = {
@@ -514,7 +515,8 @@
 		.channel2 = IIO_MOD_Y,
 		.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
 		IIO_CHAN_INFO_SCALE_SHARED_BIT |
-		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
+		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+		IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
 		.address = accel_y,
 		.scan_index = ADIS16240_SCAN_ACC_Y,
 		.scan_type = {
@@ -528,7 +530,8 @@
 		.channel2 = IIO_MOD_Z,
 		.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
 		IIO_CHAN_INFO_SCALE_SHARED_BIT |
-		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
+		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+		IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
 		.address = accel_z,
 		.scan_index = ADIS16240_SCAN_ACC_Z,
 		.scan_type = {
@@ -758,7 +758,7 @@
 			.address = AD7793_CH_AIN1M_AIN1M,
 			.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
 			IIO_CHAN_INFO_SCALE_SHARED_BIT,
-			.scan_index = 2,
+			.scan_index = 3,
 			.scan_type = IIO_ST('s', 24, 32, 0)
 		},
 		.channel[4] = {
@@ -831,7 +831,7 @@
 			.address = AD7793_CH_AIN1M_AIN1M,
 			.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
 			IIO_CHAN_INFO_SCALE_SHARED_BIT,
-			.scan_index = 2,
+			.scan_index = 3,
 			.scan_type = IIO_ST('s', 16, 32, 0)
 		},
 		.channel[4] = {
...	...	@@ -158,7 +158,8 @@
158	158	&padint, shift);
159	159	if (ret < 0) {
160	160	printf("failed to pass scan type description\n");
161		- return ret;
	161	+ ret = -errno;
	162	+ goto error_close_sysfsfp;
162	163	}
163	164	*be = (endianchar == 'b');
164	165	*bytes = padint / 8;
165	166
...	...	@@ -174,7 +175,11 @@
174	175	free(filename);
175	176
176	177	filename = 0;
	178	+ sysfsfp = 0;
177	179	}
	180	+error_close_sysfsfp:
	181	+ if (sysfsfp)
	182	+ fclose(sysfsfp);
178	183	error_free_filename:
179	184	if (filename)
180	185	free(filename);
181	186
182	187
183	188
184	189
185	190
186	191
...	...	@@ -468,23 +473,30 @@
468	473	+ strlen(type)
469	474	+ numstrlen
470	475	+ 6);
471		- if (filename == NULL)
	476	+ if (filename == NULL) {
	477	+ closedir(dp);
472	478	return -ENOMEM;
	479	+ }
473	480	sprintf(filename, "%s%s%d/name",
474	481	iio_dir,
475	482	type,
476	483	number);
477	484	nameFile = fopen(filename, "r");
478		- if (!nameFile)
	485	+ if (!nameFile) {
	486	+ free(filename);
479	487	continue;
	488	+ }
480	489	free(filename);
481	490	fscanf(nameFile, "%s", thisname);
482		- if (strcmp(name, thisname) == 0)
483		- return number;
484	491	fclose(nameFile);
	492	+ if (strcmp(name, thisname) == 0) {
	493	+ closedir(dp);
	494	+ return number;
	495	+ }
485	496	}
486	497	}
487	498	}
	499	+ closedir(dp);
488	500	return -ENODEV;
489	501	}
490	502
...	...	@@ -513,6 +525,7 @@
513	525	goto error_free;
514	526	}
515	527	fscanf(sysfsfp, "%d", &test);
	528	+ fclose(sysfsfp);
516	529	if (test != val) {
517	530	printf("Possible failure in int write %d to %s%s\n",
518	531	val,
...	...	@@ -562,6 +575,7 @@
562	575	goto error_free;
563	576	}
564	577	fscanf(sysfsfp, "%s", temp);
	578	+ fclose(sysfsfp);
565	579	if (strcmp(temp, val) != 0) {
566	580	printf("Possible failure in string write of %s "
567	581	"Should be %s "
...	...	@@ -381,7 +381,7 @@
381	381	return IIO_VAL_INT_PLUS_MICRO;
382	382	case IIO_ACCEL:
383	383	*val = 0;
384		- if (chan->channel == 'x')
	384	+ if (chan->channel2 == IIO_MOD_X)
385	385	*val2 = 17125;
386	386	else
387	387	*val2 = 8407;
...	...	@@ -500,7 +500,8 @@
500	500	.channel2 = IIO_MOD_X,
501	501	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT \|
502	502	IIO_CHAN_INFO_SCALE_SHARED_BIT \|
503		- IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
	503	+ IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT \|
	504	+ IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
504	505	.address = accel_x,
505	506	.scan_index = ADIS16240_SCAN_ACC_X,
506	507	.scan_type = {
...	...	@@ -514,7 +515,8 @@
514	515	.channel2 = IIO_MOD_Y,
515	516	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT \|
516	517	IIO_CHAN_INFO_SCALE_SHARED_BIT \|
517		- IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
	518	+ IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT \|
	519	+ IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
518	520	.address = accel_y,
519	521	.scan_index = ADIS16240_SCAN_ACC_Y,
520	522	.scan_type = {
...	...	@@ -528,7 +530,8 @@
528	530	.channel2 = IIO_MOD_Z,
529	531	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT \|
530	532	IIO_CHAN_INFO_SCALE_SHARED_BIT \|
531		- IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
	533	+ IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT \|
	534	+ IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
532	535	.address = accel_z,
533	536	.scan_index = ADIS16240_SCAN_ACC_Z,
534	537	.scan_type = {
...	...	@@ -758,7 +758,7 @@
758	758	.address = AD7793_CH_AIN1M_AIN1M,
759	759	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT \|
760	760	IIO_CHAN_INFO_SCALE_SHARED_BIT,
761		- .scan_index = 2,
	761	+ .scan_index = 3,
762	762	.scan_type = IIO_ST('s', 24, 32, 0)
763	763	},
764	764	.channel[4] = {
...	...	@@ -831,7 +831,7 @@
831	831	.address = AD7793_CH_AIN1M_AIN1M,
832	832	.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT \|
833	833	IIO_CHAN_INFO_SCALE_SHARED_BIT,
834		- .scan_index = 2,
	834	+ .scan_index = 3,
835	835	.scan_type = IIO_ST('s', 16, 32, 0)
836	836	},
837	837	.channel[4] = {