mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
This commit is contained in:
commit
3bb5da3837
613 changed files with 11365 additions and 7843 deletions
|
|
@ -256,7 +256,7 @@ EXPORT_SYMBOL(ioport_unmap);
|
|||
* */
|
||||
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
|
||||
{
|
||||
unsigned long start = pci_resource_start(dev, bar);
|
||||
resource_size_t start = pci_resource_start(dev, bar);
|
||||
unsigned long len = pci_resource_len(dev, bar);
|
||||
unsigned long flags = pci_resource_flags(dev, bar);
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ int kobject_action_type(const char *buf, size_t count,
|
|||
enum kobject_action action;
|
||||
int ret = -EINVAL;
|
||||
|
||||
if (count && buf[count-1] == '\n')
|
||||
if (count && (buf[count-1] == '\n' || buf[count-1] == '\0'))
|
||||
count--;
|
||||
|
||||
if (!count)
|
||||
|
|
|
|||
Loading…
Reference in a new issue