Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2378e38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 



Pull staging tree fixes from Greg Kroah-Hartman:
 "Here are a few staging tree fixes for problems that have been
  reported.

  Nothing major, just a number of tiny driver fixes.  All of these have
  been in the linux-next tree for a while.

  Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* tag 'staging-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  drm/omap: add more new timings fields
  drm/omap: update for interlaced
  staging: r8712u: fix bug in r8712_recv_indicatepkt()
  staging: zcache: fix cleancache race condition with shrinker
  Staging: Android alarm: IOCTL command encoding fix
  staging: vt6656: [BUG] - Failed connection, incorrect endian.
  staging: ozwpan: fix memcmp() test in oz_set_active_pd()
  staging: wlan-ng: Fix problem with wrong arguments
  staging: comedi: das08: Correct AO output for das08jr-16-ao
  staging: comedi: das08: Correct AI encoding for das08jr-16-ao
  staging: comedi: das08: Fix PCI ref count
  staging: comedi: amplc_pci230: Fix PCI ref count
  staging: comedi: amplc_pc263: Fix PCI ref count
  staging: comedi: amplc_pc236: Fix PCI ref count
  staging: comedi: amplc_dio200: Fix PCI ref count
  staging: comedi: amplc_pci224: Fix PCI ref count
  drivers/iio/adc/at91_adc.c: adjust inconsistent IS_ERR and PTR_ERR
  staging iio: fix potential memory leak in lis3l02dq_ring.c
  staging:iio: prevent divide by zero bugs
parents 0462bfc8 94254edc

drivers/iio/adc/at91_adc.c

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ static int __devinit at91_adc_probe(struct platform_device *pdev) 
	st->adc_clk = clk_get(&pdev->dev, "adc_op_clk");

	if (IS_ERR(st->adc_clk)) {

		dev_err(&pdev->dev, "Failed to get the ADC clock.\n");

		ret = PTR_ERR(st->clk);

		ret = PTR_ERR(st->adc_clk);

		goto error_disable_clk;

	}

drivers/staging/android/android_alarm.h

+3 −1
Original line number Diff line number Diff line
@@ -51,10 +51,12 @@ enum android_alarm_return_flags { 
#define ANDROID_ALARM_WAIT                  _IO('a', 1)



#define ALARM_IOW(c, type, size)            _IOW('a', (c) | ((type) << 4), size)

#define ALARM_IOR(c, type, size)            _IOR('a', (c) | ((type) << 4), size)



/* Set alarm */

#define ANDROID_ALARM_SET(type)             ALARM_IOW(2, type, struct timespec)

#define ANDROID_ALARM_SET_AND_WAIT(type)    ALARM_IOW(3, type, struct timespec)

#define ANDROID_ALARM_GET_TIME(type)        ALARM_IOW(4, type, struct timespec)

#define ANDROID_ALARM_GET_TIME(type)        ALARM_IOR(4, type, struct timespec)

#define ANDROID_ALARM_SET_RTC               _IOW('a', 5, struct timespec)

#define ANDROID_ALARM_BASE_CMD(cmd)         (cmd & ~(_IOC(0, 0, 0xf0, 0)))

#define ANDROID_ALARM_IOCTL_TO_TYPE(cmd)    (_IOC_NR(cmd) >> 4)

drivers/staging/comedi/drivers/amplc_dio200.c

+7 −0
Original line number Diff line number Diff line
@@ -1412,6 +1412,13 @@ static int __devinit dio200_attach_pci(struct comedi_device *dev, 
		dev_err(dev->class_dev, "BUG! cannot determine board type!\n");

		return -EINVAL;

	}

	/*

	 * Need to 'get' the PCI device to match the 'put' in dio200_detach().

	 * TODO: Remove the pci_dev_get() and matching pci_dev_put() once

	 * support for manual attachment of PCI devices via dio200_attach()

	 * has been removed.

	 */

	pci_dev_get(pci_dev);

	return dio200_pci_common_attach(dev, pci_dev);

}

drivers/staging/comedi/drivers/amplc_pc236.c

+7 −0
Original line number Diff line number Diff line
@@ -565,6 +565,13 @@ static int __devinit pc236_attach_pci(struct comedi_device *dev, 
		dev_err(dev->class_dev, "BUG! cannot determine board type!\n");

		return -EINVAL;

	}

	/*

	 * Need to 'get' the PCI device to match the 'put' in pc236_detach().

	 * TODO: Remove the pci_dev_get() and matching pci_dev_put() once

	 * support for manual attachment of PCI devices via pc236_attach()

	 * has been removed.

	 */

	pci_dev_get(pci_dev);

	return pc236_pci_common_attach(dev, pci_dev);

}

drivers/staging/comedi/drivers/amplc_pc263.c

+7 −0
Original line number Diff line number Diff line
@@ -298,6 +298,13 @@ static int __devinit pc263_attach_pci(struct comedi_device *dev, 
		dev_err(dev->class_dev, "BUG! cannot determine board type!\n");

		return -EINVAL;

	}

	/*

	 * Need to 'get' the PCI device to match the 'put' in pc263_detach().

	 * TODO: Remove the pci_dev_get() and matching pci_dev_put() once

	 * support for manual attachment of PCI devices via pc263_attach()

	 * has been removed.

	 */

	pci_dev_get(pci_dev);

	return pc263_pci_common_attach(dev, pci_dev);

}