Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/iomap.c b/lib/iomap.c
index db004a9ff509..dd6ca48fe6b0 100644
--- a/lib/iomap.c
+++ b/lib/iomap.c
@@ -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);
 
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index b06185ed1895..9fb6b86cf6b1 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -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)